[10.x] Throw timeoutException instead of maxAttemptsExceededException…

… when a job times out (laravel#46968)

* Throw timeoutException instead of maxAttemptsExceededException when a job times out

* formatting

---------

Co-authored-by: Taylor Otwell <[email protected]>

src/Illuminate/Queue/TimeoutExceededException.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Illuminate\Queue;
+
+class TimeoutExceededException extends MaxAttemptsExceededException
+{
+    //
+}

src/Illuminate/Queue/Worker.php

@@ -213,7 +213,7 @@ protected function registerTimeoutHandler($job, WorkerOptions $options)
         pcntl_signal(SIGALRM, function () use ($job, $options) {
             if ($job) {
                 $this->markJobAsFailedIfWillExceedMaxAttempts(
-                    $job->getConnectionName(), $job, (int) $options->maxTries, $e = $this->maxAttemptsExceededException($job)
+                    $job->getConnectionName(), $job, (int) $options->maxTries, $e = $this->timoutExceededException($job)
                 );
 
                 $this->markJobAsFailedIfWillExceedMaxExceptions(
@@ -778,7 +778,20 @@ public function kill($status = 0, $options = null)
     protected function maxAttemptsExceededException($job)
     {
         return new MaxAttemptsExceededException(
-            $job->resolveName().' has been attempted too many times or run too long. The job may have previously timed out.'
+            $job->resolveName().' has been attempted too many times.'
+        );
+    }
+
+    /**
+     * Create an instance of TimeoutExceededException.
+     *
+     * @param  \Illuminate\Contracts\Queue\Job  $job
+     * @return \Illuminate\Queue\TimeoutExceededException
+     */
+    protected function timoutExceededException($job)
+    {
+        return new TimeoutExceededException(
+            $job->resolveName().' has timed out.'
         );
     }