Merge pull request #62 from M6Web/fix/symfony5-compatibility

Author: jdecool

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: Continuous Integration
+on: [push]
+
+jobs:
+  linter:
+    name: Code style
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+      - run: composer install --prefer-dist --no-interaction
+      - run: bin/php-cs-fixer fix --dry-run --stop-on-violation --diff --ansi
+
+  tests:
+    name: Tests
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        version: ['7.1', 7.2', '7.3', '7.4', '8.0']
+        flags: ['', '--prefer-lowest']
+    steps:
+      - uses: actions/checkout@master
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.version }}
+          coverage: xdebug2
+      - run: composer update --prefer-dist --no-interaction ${{ matrix.flags }}
+      - run: bin/atoum

.php-cs-fixer.php

@@ -0,0 +1,22 @@
+<?php
+
+$config = new class() extends \PhpCsFixer\Config {
+    public function __construct()
+    {
+        parent::__construct('Bedrock(PHP 7.1)');
+    }
+
+    public function getRules()
+    {
+        return (new \M6Web\CS\Config\Php71())->getRules() + ['increment_style' => false];
+    }
+};
+
+$config->getFinder()
+    ->in([
+        __DIR__.'/src'
+    ])->exclude([
+        'Tests'
+    ]);
+
+return $config;

.php_cs

@@ -16,9 +16,11 @@
         "symfony/security-core": "^4.4|^5.0"
     },
     "require-dev": {
-        "atoum/atoum-bundle": "~1.0",
+        "atoum/atoum": "^3.4|^4.0",
+        "friendsofphp/php-cs-fixer": "^2.19",
         "m6web/symfony2-coding-standard": "~1.2",
-        "m6web/php-cs-fixer-config": "^1.0"
+        "m6web/php-cs-fixer-config": "^1.0",
+        "symfony/http-foundation": "^4.4|^5.0"
     },
     "extra": {
         "branch-alias": {

.travis.yml

@@ -3,7 +3,7 @@
 namespace M6Web\Bundle\LogBridgeBundle\EventDispatcher;
 
 use M6Web\Bundle\LogBridgeBundle\Matcher\BuilderInterface;
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 
 /**
  * BuilderEvent

composer.json

@@ -2,7 +2,7 @@
 
 namespace M6Web\Bundle\LogBridgeBundle\EventDispatcher;
 
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 
 /**
  * LogExceptionListener overload here to send the entire exception to log bridge.
@@ -23,13 +23,9 @@ public function __construct($requestExceptionAttribute)
     /**
      * React to an exception to give error message to log bridge
      */
-    public function onKernelException(GetResponseForExceptionEvent $event)
+    public function onKernelException(ExceptionEvent $event)
     {
-        if (method_exists($event, 'getThrowable')) {
-            $exception = $event->getThrowable();
-        } else {
-            $exception = $event->getException();
-        }
+        $exception = $event->getThrowable();
 
         $request = $event->getRequest();
         $request->setRequestFormat('json');

src/M6Web/Bundle/LogBridgeBundle/EventDispatcher/BuilderEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace M6Web\Bundle\LogBridgeBundle\Tests\Units\EventDispatcher;
+
+use atoum;
+use M6Web\Bundle\LogBridgeBundle\EventDispatcher\BuilderEvent as TestedClass;
+
+class BuilderEvent extends atoum
+{
+    public function testBuildEventIsInstanciable()
+    {
+        $this
+            ->given($this->mockGenerator->orphanize('__construct'))
+            ->if($this->newTestedInstance(
+                new \mock\M6Web\Bundle\LogBridgeBundle\Matcher\BuilderInterface,
+                []
+            ))
+            ->then
+                ->object($this->testedInstance)
+                    ->isInstanceOf(TestedClass::class)
+        ;
+    }
+}

src/M6Web/Bundle/LogBridgeBundle/EventDispatcher/LogExceptionListener.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace M6Web\Bundle\LogBridgeBundle\Tests\Units\EventDispatcher;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+
+class LogExceptionListener
+{
+    public function testOnKernelExceptionCall()
+    {
+        $this
+            ->given(
+                $request = Request::create('/path'),
+                $exception = new \Exception()
+            )
+            ->if($this->newTestedInstance('foo-attribute'))
+            ->when($this->testedInstance->onKernelException(new ExceptionEvent(
+                new \mock\Symfony\Component\HttpKernel\HttpKernelInterface,
+                $request,
+                HttpKernelInterface::MAIN_REQUEST,
+                $exception
+            )))
+            ->then
+                ->array($request->attributes->all())
+                    ->hasKey('foo-attribute')
+                ->object($request->attributes->get('foo-attribute'))
+                    ->isIdenticalTo($exception)
+        ;
+    }
+}

src/M6Web/Bundle/LogBridgeBundle/Tests/Units/EventDispatcher/BuilderEvent.php

@@ -2,10 +2,10 @@
 
 namespace M6Web\Bundle\LogBridgeBundle\Tests\Units\Matcher\Status\Type;
 
-use atoum\AtoumBundle\Test\Units;
+use atoum;
 use M6Web\Bundle\LogBridgeBundle\Tests\Fixtures\Matcher\Status\Type\Sample1Type as TestedClass;
 
-class AbstractType extends Units\Test
+class AbstractType extends atoum
 {
     public function getSample1TypeMock()
     {
@@ -74,4 +74,4 @@ public function testIsExclude()
                 ->isTrue()
         ;
     }
-}
+}