Merge branch 'master' into 5.5

Author: dmitry-ivanov

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 install:
   - composer update

composer.json

@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0",
-        "mockery/mockery": "^0.9",
+        "mockery/mockery": "^1.0",
         "guzzlehttp/guzzle": "^6.0",
         "orchestra/testbench": "3.5.*",
         "illuminated/testing-tools": "5.5.*"

composer.lock

@@ -64,7 +64,7 @@ public function onShutdown()
 
         $this->logger->info('%separator%');
 
-        $handlers = $this->logger->getHandlers();
+        $handlers = (array) $this->logger->getHandlers();
         foreach ($handlers as $handler) {
             $handler->close();
         }

src/Exceptions/ExceptionHandler.php

@@ -14,33 +14,23 @@ class ExceptionHandlerTest extends TestCase
     /** @test */
     public function it_logs_an_error_for_all_occurred_application_notices_warnings_errors_and_exceptions()
     {
-        $logger = Mockery::mock(LoggerInterface::class);
-        $logger->shouldReceive('error')->with('Test exception', Mockery::subset([
-            'code' => 111,
-            'message' => 'Test exception',
-            'file' => __FILE__,
-        ]))->once();
+        $logger = spy(LoggerInterface::class);
 
         $handler = app(ExceptionHandler::class);
         $handler->setLogger($logger);
         $handler->report(new Exception('Test exception', 111));
+
+        $logger->shouldHaveReceived()->error('Test exception', Mockery::subset([
+            'code' => 111,
+            'message' => 'Test exception',
+            'file' => __FILE__,
+        ]));
     }
 
     /** @test */
     public function it_supports_custom_runtime_exception_which_has_ability_to_set_optional_context()
     {
-        $logger = Mockery::mock(LoggerInterface::class);
-        $logger->shouldReceive('error')->with('Test exception with context', Mockery::subset([
-            'code' => 111,
-            'message' => 'Test exception with context',
-            'file' => __FILE__,
-            'context' => [
-                'foo' => 'bar',
-                'baz' => 123,
-                'faz' => true,
-                'daz' => null,
-            ],
-        ]))->once();
+        $logger = spy(LoggerInterface::class);
 
         $handler = app(ExceptionHandler::class);
         $handler->setLogger($logger);
@@ -50,5 +40,17 @@ public function it_supports_custom_runtime_exception_which_has_ability_to_set_op
             'faz' => true,
             'daz' => null,
         ], 111));
+
+        $logger->shouldHaveReceived()->error('Test exception with context', Mockery::subset([
+            'code' => 111,
+            'message' => 'Test exception with context',
+            'file' => __FILE__,
+            'context' => [
+                'foo' => 'bar',
+                'baz' => 123,
+                'faz' => true,
+                'daz' => null,
+            ],
+        ]));
     }
 }

tests/ConsoleLogger/Exceptions/ExceptionHandlerTest.php

@@ -161,6 +161,7 @@ private function normalizeMailerHandlerDump($dump)
         $dump = preg_replace('/".*[email protected]"/', '"normalized"', $dump);
         $dump = preg_replace('/\+"date": ".*?\.\d*"/', '+date: "normalized"', $dump);
         $dump = preg_replace('/date: .*?\.\d*/', 'date: "normalized"', $dump);
+        $dump = preg_replace('/-dateTime: DateTimeImmutable @\d*/', '-dateTime: DateTimeImmutable @normalized', $dump);
         $dump = preg_replace('/-cacheKey: ".*?"/', '-cacheKey: "normalized"', $dump);
         $dump = preg_replace('/-_timestamp: .*?\n/', '', $dump);
         $dump = preg_replace('/#initialized: .*?\n/', '', $dump);

tests/ConsoleLogger/Loggable/Notifications/EmailChannel/EmailChannelTest.php

@@ -5,7 +5,7 @@
 use GenericCommand;
 use Illuminated\Console\Exceptions\ExceptionHandler;
 use Mockery;
-use Monolog\Handler\RotatingFileHandler;
+use Monolog\Handler\AbstractProcessingHandler;
 use Psr\Log\LoggerInterface;
 
 class LoggableTraitOnMysqlTest extends TestCase
@@ -55,20 +55,22 @@ public function it_writes_to_log_file_mysql_specific_information_after_header()
      * @runInSeparateProcess
      * @preserveGlobalState disabled
      */
-    public function it_writes_to_log_file_information_footer_each_iteration()
+    public function it_writes_to_log_file_information_footer_each_iteration_and_close_all_handlers_on_shutdown()
     {
-        $logger = Mockery::mock(LoggerInterface::class);
-        $logger->shouldReceive('info')->with('/Execution time\: .*? sec\./')->once();
-        $logger->shouldReceive('info')->with('/Memory peak usage\: .*?\./')->once();
-        $logger->shouldReceive('info')->with('%separator%')->once();
-        $logger->shouldReceive('getHandlers')->withNoArgs()->once()->andReturn([
-            new RotatingFileHandler('foo'),
-            new RotatingFileHandler('bar'),
-            new RotatingFileHandler('baz'),
+        $logger = spy(LoggerInterface::class);
+        $logger->expects()->getHandlers()->andReturn([
+            $processingHandler1 = spy(AbstractProcessingHandler::class),
+            $processingHandler2 = spy(AbstractProcessingHandler::class),
         ]);
 
         $handler = app(ExceptionHandler::class);
         $handler->initialize($logger);
         $handler->onShutdown();
+
+        $logger->shouldHaveReceived()->info(Mockery::pattern('/Execution time\: .*? sec\./'));
+        $logger->shouldHaveReceived()->info(Mockery::pattern('/Memory peak usage\: .*?\./'));
+        $logger->shouldHaveReceived()->info('%separator%');
+        $processingHandler1->shouldHaveReceived()->close();
+        $processingHandler2->shouldHaveReceived()->close();
     }
 }