fix conflicts

laravel · Jul 21, 2022 · a1944cd · a1944cd
2 parents 2999838 + 1b3b06e
commit a1944cd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 58 deletions.
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -35,7 +35,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '9.21.4';
+    const VERSION = '9.21.5';
 
     /**
      * The base path for the Laravel installation.

diff --git a/src/Illuminate/Queue/SyncQueue.php b/src/Illuminate/Queue/SyncQueue.php
@@ -12,8 +12,6 @@
 
 class SyncQueue extends Queue implements QueueContract
 {
-    protected $jobsCount = 0;
-
     /**
      * Get the size of the queue.
      *
@@ -39,8 +37,6 @@ public function push($job, $data = '', $queue = null)
     {
         $queueJob = $this->resolveJob($this->createPayload($job, $queue, $data), $queue);
 
-        $this->jobsCount++;
-
         try {
             $this->raiseBeforeJobEvent($queueJob);
 
@@ -49,8 +45,6 @@ public function push($job, $data = '', $queue = null)
             $this->raiseAfterJobEvent($queueJob);
         } catch (Throwable $e) {
             $this->handleException($queueJob, $e);
-        } finally {
-            $this->jobsCount--;
         }
 
         return 0;
@@ -119,19 +113,11 @@ protected function raiseExceptionOccurredJobEvent(Job $job, Throwable $e)
      */
     protected function handleException(Job $queueJob, Throwable $e)
     {
-        static $isGuarded = false;
-
-        if ($isGuarded) {
-            $isGuarded = false;
-        } else {
-            $isGuarded = $this->jobsCount > 1;
+        $this->raiseExceptionOccurredJobEvent($queueJob, $e);
 
-            $this->raiseExceptionOccurredJobEvent($queueJob, $e);
+        $queueJob->fail($e);
 
-            $queueJob->fail($e);
-
-            throw $e;
-        }
+        throw $e;
     }
 
     /**

diff --git a/tests/Integration/Queue/JobChainingTest.php b/tests/Integration/Queue/JobChainingTest.php
@@ -13,7 +13,7 @@
 
 class JobChainingTest extends TestCase
 {
-    public static $catchCallbackCount = 0;
+    public static $catchCallbackRan = false;
 
     protected function getEnvironmentSetUp($app)
     {
@@ -31,6 +31,7 @@ protected function tearDown(): void
         JobChainingTestFirstJob::$ran = false;
         JobChainingTestSecondJob::$ran = false;
         JobChainingTestThirdJob::$ran = false;
+        static::$catchCallbackRan = false;
     }
 
     public function testJobsCanBeChainedOnSuccess()
@@ -148,56 +149,19 @@ public function testThirdJobIsNotFiredIfSecondFails()
 
     public function testCatchCallbackIsCalledOnFailure()
     {
-        self::$catchCallbackCount = 0;
-
         Bus::chain([
             new JobChainingTestFirstJob,
             new JobChainingTestFailingJob,
             new JobChainingTestSecondJob,
         ])->catch(static function () {
-            self::$catchCallbackCount++;
+            self::$catchCallbackRan = true;
         })->dispatch();
 
         $this->assertTrue(JobChainingTestFirstJob::$ran);
-        $this->assertSame(1, static::$catchCallbackCount);
+        $this->assertTrue(static::$catchCallbackRan);
         $this->assertFalse(JobChainingTestSecondJob::$ran);
     }
 
-    public function testCatchCallbackIsCalledOnceOnSyncQueue()
-    {
-        self::$catchCallbackCount = 0;
-
-        try {
-            Bus::chain([
-                new JobChainingTestFirstJob(),
-                new JobChainingTestThrowJob(),
-                new JobChainingTestSecondJob(),
-            ])->catch(function () {
-                self::$catchCallbackCount++;
-            })->onConnection('sync')->dispatch();
-        } finally {
-            $this->assertTrue(JobChainingTestFirstJob::$ran);
-            $this->assertSame(1, static::$catchCallbackCount);
-            $this->assertFalse(JobChainingTestSecondJob::$ran);
-        }
-
-        self::$catchCallbackCount = 0;
-
-        try {
-            Bus::chain([
-                new JobChainingTestFirstJob(),
-                new JobChainingTestThrowJob(),
-                new JobChainingTestSecondJob(),
-            ])->catch(function () {
-                self::$catchCallbackCount++;
-            })->onConnection('sync')->dispatch();
-        } finally {
-            $this->assertTrue(JobChainingTestFirstJob::$ran);
-            $this->assertSame(1, static::$catchCallbackCount);
-            $this->assertFalse(JobChainingTestSecondJob::$ran);
-        }
-    }
-
     public function testChainJobsUseSameConfig()
     {
         JobChainingTestFirstJob::dispatch()->allOnQueue('some_queue')->allOnConnection('sync1')->chain([