version

Author: taylorotwell

src/Illuminate/Foundation/Application.php

@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '7.12.0';
+    const VERSION = '7.13.0';
 
     /**
      * The base path for the Laravel installation.

tests/Queue/QueueWorkerTest.php

@@ -59,19 +59,21 @@ public function testWorkerCanWorkUntilQueueIsEmpty()
             $secondJob = new WorkerFakeJob,
         ]]);
 
-        $this->expectException(LoopBreakerException::class);
+        try {
+            $worker->daemon('default', 'queue', $workerOptions);
 
-        $worker->daemon('default', 'queue', $workerOptions);
+            $this->fail('Expected LoopBreakerException to be thrown.');
+        } catch (LoopBreakerException $e) {
+            $this->assertTrue($firstJob->fired);
 
-        $this->assertTrue($firstJob->fired);
+            $this->assertTrue($secondJob->fired);
 
-        $this->assertTrue($secondJob->fired);
+            $this->assertSame(0, $worker->stoppedWithStatus);
 
-        $this->assertSame(0, $worker->stoppedWithStatus);
+            $this->events->shouldHaveReceived('dispatch')->with(m::type(JobProcessing::class))->twice();
 
-        $this->events->shouldHaveReceived('dispatch')->with(m::type(JobProcessing::class))->twice();
-
-        $this->events->shouldHaveReceived('dispatch')->with(m::type(JobProcessed::class))->twice();
+            $this->events->shouldHaveReceived('dispatch')->with(m::type(JobProcessed::class))->twice();
+        }
     }
 
     public function testJobCanBeFiredBasedOnPriority()
@@ -276,21 +278,23 @@ public function testJobRunsIfAppIsNotInMaintenanceMode()
 
         $maintenanceModeChecker = function () {
             if ($this->maintenanceFlags) {
-                return array_pop($this->maintenanceFlags);
+                return array_shift($this->maintenanceFlags);
             }
 
             throw new LoopBreakerException;
         };
 
-        $this->expectException(LoopBreakerException::class);
-
         $worker = $this->getWorker('default', ['queue' => [$firstJob, $secondJob]], $maintenanceModeChecker);
 
-        $worker->daemon('default', 'queue', $this->workerOptions());
+        try {
+            $worker->daemon('default', 'queue', $this->workerOptions());
 
-        $this->assertEquals($firstJob->attempts, 1);
+            $this->fail('Expected LoopBreakerException to be thrown');
+        } catch (LoopBreakerException $e) {
+            $this->assertSame(1, $firstJob->attempts);
 
-        $this->assertEquals($firstJob->attempts, 0);
+            $this->assertSame(0, $secondJob->attempts);
+        }
     }
 
     public function testJobDoesNotFireIfDeleted()
@@ -349,6 +353,7 @@ private function workerOptions(array $overrides = [])
 class InsomniacWorker extends Worker
 {
     public $sleptFor;
+    public $stopOnMemoryExceeded = false;
 
     public function sleep($seconds)
     {
@@ -366,6 +371,11 @@ public function daemonShouldRun(WorkerOptions $options, $connectionName, $queue)
     {
         return ! ($this->isDownForMaintenance)();
     }
+
+    public function memoryExceeded($memoryLimit)
+    {
+        return $this->stopOnMemoryExceeded;
+    }
 }
 
 class WorkerFakeManager extends QueueManager