update dependencies

phpgears · Oct 1, 2019 · ce95a6b · ce95a6b
1 parent 602db73
commit ce95a6b
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 83 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,13 +1,24 @@
 # language: php
 
+build:
+  dependencies:
+    before:
+      - 'composer self-update'
+      - 'composer update --prefer-stable --prefer-source --no-interaction --no-progress --no-suggest'
+  cache:
+    directories:
+      - vendor/
+  nodes:
+    analysis:
+      project_setup:
+        override: true
+      tests:
+        override: [php-scrutinizer-run]
+
 filter:
   paths: [src/*]
   excluded_paths: [tests/*, vendor/*]
 
-before_commands:
-  - 'composer self-update'
-  - 'composer update --prefer-stable --prefer-source --no-interaction --no-scripts --no-progress --no-suggest'
-
 coding_style:
   php:
     upper_lower_casing:
@@ -17,8 +28,8 @@ coding_style:
         true_false_null: lower
     spaces:
       around_operators:
-          concatenation: true
-          negation: false
+        concatenation: true
+        negation: false
       other:
         after_type_cast: true
 
@@ -34,7 +45,6 @@ tools:
     enabled: true
     config:
       ruleset: 'unusedcode,naming,design,controversial,codesize'
-
   php_cpd: true
   php_loc: true
   php_pdepend: true

diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,9 @@ env:
   - COMPOSER_FLAGS="--prefer-stable --prefer-dist"
 
 php:
+  - 7.2
   - 7.3
+  - 7.4snapshot
   - nightly
 
 matrix:
@@ -22,25 +24,25 @@ matrix:
     - php: 7.1
       env:
         - COMPOSER_FLAGS="--prefer-lowest --prefer-stable --prefer-dist"
-    - php: 7.2
+    - php: 7.1
       env:
         - TEST_VERSION=true
         - COMPOSER_FLAGS="--prefer-stable --prefer-dist"
   allow_failures:
     - php: nightly
 
 before_install:
- - if [[ -z $TEST_VERSION && -f "/home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" ]]; then phpenv config-rm xdebug.ini; fi
- - composer global require hirak/prestissimo
- - composer self-update --stable --no-progress
+  - if [[ -z $TEST_VERSION && -f "/home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" ]]; then phpenv config-rm xdebug.ini; fi
+  - composer global require hirak/prestissimo
+  - composer self-update --stable --no-progress
 
 install:
- - travis_retry composer update $COMPOSER_FLAGS --no-interaction --no-scripts --no-progress
- - if [[ $TEST_VERSION ]]; then travis_retry composer require php-coveralls/php-coveralls $COMPOSER_FLAGS --no-interaction --no-scripts --no-progress ; fi
+  - travis_retry composer update $COMPOSER_FLAGS --no-interaction --no-progress
+  - if [[ $TEST_VERSION ]]; then travis_retry composer require php-coveralls/php-coveralls $COMPOSER_FLAGS --no-interaction --no-scripts --no-progress ; fi
 
 script:
- - if [[ $TEST_VERSION ]]; then composer qa && composer report-phpunit-clover ; fi
- - if [[ -z $TEST_VERSION ]]; then composer test-phpunit ; fi
+  - if [[ $TEST_VERSION ]]; then composer qa && composer report-phpunit-clover ; fi
+  - if [[ -z $TEST_VERSION ]]; then composer test-phpunit ; fi
 
 after_script:
- - if [[ $TEST_VERSION ]]; then travis_retry php vendor/bin/php-coveralls --verbose ; fi
+  - if [[ $TEST_VERSION ]]; then travis_retry php vendor/bin/php-coveralls --verbose ; fi
diff --git a/composer.json b/composer.json
@@ -27,23 +27,24 @@
   "prefer-stable": true,
   "require": {
     "php": "^7.1",
-    "phpgears/cqrs": "~0.2",
+    "phpgears/cqrs": "~0.3",
     "symfony/messenger": "^4.3"
   },
   "require-dev": {
     "brainmaestro/composer-git-hooks": "^2.1",
     "friendsofphp/php-cs-fixer": "^2.0",
     "infection/infection": "^0.9",
     "phpmd/phpmd": "^2.0",
-    "phpstan/phpstan": "^0.11",
-    "phpstan/phpstan-deprecation-rules": "^0.11",
-    "phpstan/phpstan-strict-rules": "^0.11",
-    "phpunit/phpunit": "^6.0|^7.0",
+    "phpstan/extension-installer": "^1.0",
+    "phpstan/phpstan": "~0.11.12",
+    "phpstan/phpstan-deprecation-rules": "~0.11.2",
+    "phpstan/phpstan-strict-rules": "~0.11.1",
+    "phpunit/phpunit": "^7.0|^8.0",
     "povils/phpmnd": "^2.0",
     "roave/security-advisories": "dev-master",
-    "sebastian/phpcpd": "^3.0|^4.0",
-    "squizlabs/php_codesniffer": "^2.0",
-    "thecodingmachine/phpstan-strict-rules": "^0.11"
+    "sebastian/phpcpd": "^4.0",
+    "squizlabs/php_codesniffer": "^3.0",
+    "thecodingmachine/phpstan-strict-rules": "~0.11.2"
   },
   "suggest": {
   },

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,8 +1,3 @@
-includes:
-  - vendor/phpstan/phpstan-strict-rules/rules.neon
-  - vendor/phpstan/phpstan-deprecation-rules/rules.neon
-  - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
-
 parameters:
   level: max
   paths:

diff --git a/tests/Messenger/CommandBusTest.php b/tests/Messenger/CommandBusTest.php
@@ -29,9 +29,9 @@ public function testHandling(): void
         $messengerMock = $this->getMockBuilder(MessageBusInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $messengerMock->expects($this->once())
+        $messengerMock->expects(static::once())
             ->method('dispatch')
-            ->will($this->returnValue(new Envelope(new \stdClass())));
+            ->will(static::returnValue(new Envelope(new \stdClass())));
         /* @var MessageBusInterface $messengerMock */
 
         (new CommandBus($messengerMock))->handle(CommandStub::instance());

diff --git a/tests/Messenger/CommandHandlerLocatorTest.php b/tests/Messenger/CommandHandlerLocatorTest.php
@@ -13,6 +13,8 @@
 
 namespace Gears\CQRS\Symfony\Messenger\Tests;
 
+use Gears\CQRS\Exception\InvalidCommandException;
+use Gears\CQRS\Exception\InvalidCommandHandlerException;
 use Gears\CQRS\Symfony\Messenger\CommandHandlerLocator;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\CommandHandlerStub;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\CommandStub;
@@ -25,25 +27,23 @@
  */
 class CommandHandlerLocatorTest extends TestCase
 {
-    /**
-     * @expectedException \Gears\CQRS\Exception\InvalidCommandException
-     * @expectedExceptionMessage Command must implement Gears\CQRS\Command interface, stdClass given
-     */
     public function testInvalidCommand(): void
     {
+        $this->expectException(InvalidCommandException::class);
+        $this->expectExceptionMessage('Command must implement Gears\CQRS\Command interface, stdClass given');
+
         $envelope = new Envelope(new \stdClass());
 
         foreach ((new CommandHandlerLocator([]))->getHandlers($envelope) as $handler) {
             continue;
         }
     }
 
-    /**
-     * @expectedException \Gears\CQRS\Exception\InvalidCommandHandlerException
-     * @expectedExceptionMessage Only one command handler allowed, 2 given
-     */
     public function testInvalidCommandHandlersCount(): void
     {
+        $this->expectException(InvalidCommandHandlerException::class);
+        $this->expectExceptionMessage('Only one command handler allowed, 2 given');
+
         $commandMap = [CommandStub::class => ['', '']];
         $envelope = new Envelope(new \stdClass());
 
@@ -52,12 +52,13 @@ public function testInvalidCommandHandlersCount(): void
         }
     }
 
-    /**
-     * @expectedException \Gears\CQRS\Exception\InvalidCommandHandlerException
-     * @expectedExceptionMessage Command handler must implement Gears\CQRS\CommandHandler interface, string given
-     */
     public function testInvalidCommandHandler(): void
     {
+        $this->expectException(InvalidCommandHandlerException::class);
+        $this->expectExceptionMessage(
+            'Command handler must implement Gears\CQRS\CommandHandler interface, string given'
+        );
+
         $commandMap = [CommandStub::class => ['']];
         $envelope = new Envelope(CommandStub::instance());
 
@@ -73,7 +74,7 @@ public function testCommandHandler(): void
         $envelope = new Envelope(CommandStub::instance());
 
         foreach ((new CommandHandlerLocator($commandMap))->getHandlers($envelope) as $handler) {
-            $this->assertInstanceOf(HandlerDescriptor::class, $handler);
+            static::assertInstanceOf(HandlerDescriptor::class, $handler);
         }
     }
 }
diff --git a/tests/Messenger/ContainerAwareCommandHandlerLocatorTest.php b/tests/Messenger/ContainerAwareCommandHandlerLocatorTest.php
@@ -13,6 +13,7 @@
 
 namespace Gears\CQRS\Symfony\Messenger\Tests;
 
+use Gears\CQRS\Exception\InvalidCommandHandlerException;
 use Gears\CQRS\Symfony\Messenger\ContainerAwareCommandHandlerLocator;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\CommandHandlerStub;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\CommandStub;
@@ -26,19 +27,20 @@
  */
 class ContainerAwareCommandHandlerLocatorTest extends TestCase
 {
-    /**
-     * @expectedException \Gears\CQRS\Exception\InvalidCommandHandlerException
-     * @expectedExceptionMessage Command handler must implement Gears\CQRS\CommandHandler interface, string given
-     */
     public function testInvalidCommandHandler(): void
     {
+        $this->expectException(InvalidCommandHandlerException::class);
+        $this->expectExceptionMessage(
+            'Command handler must implement Gears\CQRS\CommandHandler interface, string given'
+        );
+
         $container = $this->getMockBuilder(ContainerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $container->expects($this->once())
+        $container->expects(static::once())
             ->method('get')
             ->with('handler')
-            ->will($this->returnValue(''));
+            ->will(static::returnValue(''));
         /* @var ContainerInterface $container */
 
         $commandMap = [CommandStub::class => ['handler']];
@@ -57,18 +59,18 @@ public function testCommandHandler(): void
         $container = $this->getMockBuilder(ContainerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $container->expects($this->once())
+        $container->expects(static::once())
             ->method('get')
             ->with('handler')
-            ->will($this->returnValue($commandHandler));
+            ->will(static::returnValue($commandHandler));
         /* @var ContainerInterface $container */
 
         $commandMap = [CommandStub::class => ['handler']];
         $locator = new ContainerAwareCommandHandlerLocator($container, $commandMap);
         $envelope = new Envelope(CommandStub::instance());
 
         foreach ($locator->getHandlers($envelope) as $handler) {
-            $this->assertInstanceOf(HandlerDescriptor::class, $handler);
+            static::assertInstanceOf(HandlerDescriptor::class, $handler);
         }
     }
 }
diff --git a/tests/Messenger/ContainerAwareQueryHandlerLocatorTest.php b/tests/Messenger/ContainerAwareQueryHandlerLocatorTest.php
@@ -13,6 +13,7 @@
 
 namespace Gears\CQRS\Symfony\Messenger\Tests;
 
+use Gears\CQRS\Exception\InvalidQueryHandlerException;
 use Gears\CQRS\Symfony\Messenger\ContainerAwareQueryHandlerLocator;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\QueryHandlerStub;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\QueryStub;
@@ -26,19 +27,18 @@
  */
 class ContainerAwareQueryHandlerLocatorTest extends TestCase
 {
-    /**
-     * @expectedException \Gears\CQRS\Exception\InvalidQueryHandlerException
-     * @expectedExceptionMessage Query handler must implement Gears\CQRS\QueryHandler interface, string given
-     */
     public function testInvalidCommandHandler(): void
     {
+        $this->expectException(InvalidQueryHandlerException::class);
+        $this->expectExceptionMessage('Query handler must implement Gears\CQRS\QueryHandler interface, string given');
+
         $container = $this->getMockBuilder(ContainerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $container->expects($this->once())
+        $container->expects(static::once())
             ->method('get')
             ->with('handler')
-            ->will($this->returnValue(''));
+            ->will(static::returnValue(''));
         /* @var ContainerInterface $container */
 
         $queryMap = [QueryStub::class => ['handler']];
@@ -57,18 +57,18 @@ public function testQueryHandler(): void
         $container = $this->getMockBuilder(ContainerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $container->expects($this->once())
+        $container->expects(static::once())
             ->method('get')
             ->with('handler')
-            ->will($this->returnValue($queryHandler));
+            ->will(static::returnValue($queryHandler));
         /* @var ContainerInterface $container */
 
         $queryMap = [QueryStub::class => ['handler']];
         $locator = new ContainerAwareQueryHandlerLocator($container, $queryMap);
         $envelope = new Envelope(QueryStub::instance());
 
         foreach ($locator->getHandlers($envelope) as $handler) {
-            $this->assertInstanceOf(HandlerDescriptor::class, $handler);
+            static::assertInstanceOf(HandlerDescriptor::class, $handler);
         }
     }
 }
diff --git a/tests/Messenger/QueryBusTest.php b/tests/Messenger/QueryBusTest.php
@@ -13,6 +13,7 @@
 
 namespace Gears\CQRS\Symfony\Messenger\Tests;
 
+use Gears\CQRS\Exception\QueryReturnException;
 use Gears\CQRS\Symfony\Messenger\QueryBus;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\DTOStub;
 use Gears\CQRS\Symfony\Messenger\Tests\Stub\QueryStub;
@@ -27,12 +28,13 @@
  */
 class QueryBusTest extends TestCase
 {
-    /**
-     * @expectedException \Gears\CQRS\Exception\QueryReturnException
-     * @expectedExceptionMessageRegExp /^Query handler for .+\\QueryStub should return an instance of Gears\\DTO\\DTO/
-     */
     public function testInvalidQueryResponse(): void
     {
+        $this->expectException(QueryReturnException::class);
+        $this->expectExceptionMessageRegExp(
+            '/^Query handler for .+\\\QueryStub should return an instance of Gears\\\DTO\\\DTO/'
+        );
+
         $callable = function ($class) {
             return $class;
         };
@@ -42,9 +44,9 @@ public function testInvalidQueryResponse(): void
         $messengerMock = $this->getMockBuilder(MessageBusInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $messengerMock->expects($this->once())
+        $messengerMock->expects(static::once())
             ->method('dispatch')
-            ->will($this->returnValue($returnEnvelope));
+            ->will(static::returnValue($returnEnvelope));
         /* @var MessageBusInterface $messengerMock */
 
         (new QueryBus($messengerMock))->handle(QueryStub::instance());
@@ -61,9 +63,9 @@ public function testHandling(): void
         $messengerMock = $this->getMockBuilder(MessageBusInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $messengerMock->expects($this->once())
+        $messengerMock->expects(static::once())
             ->method('dispatch')
-            ->will($this->returnValue($returnEnvelope));
+            ->will(static::returnValue($returnEnvelope));
         /* @var MessageBusInterface $messengerMock */
 
         (new QueryBus($messengerMock))->handle(QueryStub::instance());