Merge pull request #2 from Micro-PHP/v1.6.0-dev

v1.6.0 release

Author: Asisyas

composer.json

@@ -10,9 +10,10 @@
         }
     ],
     "require": {
-        "micro/kernel-boot-plugin-depended": "^1",
-        "micro/plugin-event-emitter": "^1",
-        "micro/plugin-http-core": "^1"
+        "micro/kernel-app": "^1.6",
+        "micro/kernel-boot-plugin-depended": "^1.6",
+        "micro/plugin-event-emitter": "^1.6",
+        "micro/plugin-http-core": "^1.6"
     },
     "require-dev": {
         "ergebnis/composer-normalize": "^2.29",

src/Listener/ApplicationStartedListener.php

@@ -16,6 +16,7 @@
 use Micro\Component\EventEmitter\EventInterface;
 use Micro\Component\EventEmitter\EventListenerInterface;
 use Micro\Kernel\App\Business\Event\ApplicationReadyEvent;
+use Micro\Kernel\App\Business\Event\ApplicationReadyEventInterface;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -29,9 +30,15 @@ public function __construct(
     ) {
     }
 
+    /**
+     * @param ApplicationReadyEvent $event
+     *
+     * @psalm-suppress MoreSpecificImplementedParamType
+     */
     public function on(EventInterface $event): void
     {
-        if (!$this->isHttp()) {
+        $sysenv = $event->systemEnvironment();
+        if ('cli' === $sysenv) {
             return;
         }
 
@@ -40,13 +47,8 @@ public function on(EventInterface $event): void
         $this->httpFacade->execute($request);
     }
 
-    protected function isHttp(): bool
-    {
-        return \PHP_SAPI !== 'cli';
-    }
-
     public static function supports(EventInterface $event): bool
     {
-        return $event instanceof ApplicationReadyEvent;
+        return $event instanceof ApplicationReadyEventInterface;
     }
 }

tests/Unit/Listener/ApplicationStartedListenerTest.php

@@ -13,8 +13,7 @@
 
 namespace Micro\Plugin\Http\Test\Unit\Listener;
 
-use Micro\Kernel\App\AppKernelInterface;
-use Micro\Kernel\App\Business\Event\ApplicationReadyEvent;
+use Micro\Kernel\App\Business\Event\ApplicationReadyEventInterface;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
 use Micro\Plugin\Http\Listener\ApplicationStartedListener;
 use PHPUnit\Framework\TestCase;
@@ -26,35 +25,26 @@ class ApplicationStartedListenerTest extends TestCase
 
     private HttpFacadeInterface $httpFacade;
 
-    private ApplicationReadyEvent $applicationReadyEvent;
-
     protected function setUp(): void
     {
         $this->httpFacade = $this->createMock(HttpFacadeInterface::class);
-        $this->applicationStartedListener = $this->getMockBuilder(ApplicationStartedListener::class)
-            ->setConstructorArgs([
-                $this->httpFacade,
-            ])
-            ->onlyMethods([
-                'isHttp',
-            ])
-            ->getMock();
+        $this->applicationStartedListener = new ApplicationStartedListener($this->httpFacade);
+    }
 
-        $this->applicationReadyEvent = new ApplicationReadyEvent(
-            $this->createMock(AppKernelInterface::class),
-            'any',
-        );
+    protected function createEvent(bool $isHttp)
+    {
+        $evt = $this->createMock(ApplicationReadyEventInterface::class);
+        $evt->method('systemEnvironment')->willReturn($isHttp ? 'http' : 'cli');
+
+        return $evt;
     }
 
     /**
      * @dataProvider dataProvider
      */
     public function testOn(bool $isHttp): void
     {
-        $this->applicationStartedListener
-            ->expects($this->once())
-            ->method('isHttp')
-            ->willReturn($isHttp);
+        $event = $this->createEvent($isHttp);
 
         if (!$isHttp) {
             $this->httpFacade
@@ -69,18 +59,7 @@ public function testOn(bool $isHttp): void
                 );
         }
 
-        $this->applicationStartedListener->on($this->applicationReadyEvent);
-    }
-
-    public function testIsHttp()
-    {
-        $this->httpFacade->expects($this->never())->method('execute');
-
-        $appListener = new ApplicationStartedListener(
-            $this->httpFacade
-        );
-
-        $appListener->on($this->applicationReadyEvent);
+        $this->applicationStartedListener->on($event);
     }
 
     public function dataProvider(): array
@@ -96,6 +75,6 @@ public function testSupports()
         $httpFacade = $this->createMock(HttpFacadeInterface::class);
         $listener = new ApplicationStartedListener($httpFacade);
 
-        $this->assertTrue($listener->supports($this->applicationReadyEvent));
+        $this->assertTrue($listener->supports($this->createEvent(true)));
     }
 }