use common exceptions

phpgears · Feb 3, 2019 · a59e611 · a59e611
1 parent 3720876
commit a59e611
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 67 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ env:
   - COMPOSER_FLAGS="--prefer-stable --prefer-dist"
 
 php:
-  - 7.2
+  - 7.3
   - nightly
 
 matrix:
@@ -22,7 +22,7 @@ matrix:
     - php: 7.1
       env:
         - COMPOSER_FLAGS="--prefer-lowest --prefer-stable --prefer-dist"
-    - php: 7.1
+    - php: 7.2
       env:
         - TEST_VERSION=true
         - COMPOSER_FLAGS="--prefer-stable --prefer-dist"

diff --git a/composer.json b/composer.json
@@ -27,22 +27,22 @@
   "require": {
     "php": "^7.1",
     "league/tactician": "^1.0",
-    "phpgears/cqrs": "~0.1"
+    "phpgears/cqrs": "~0.2"
   },
   "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.10",
-    "phpstan/phpstan-deprecation-rules": "^0.10",
-    "phpstan/phpstan-strict-rules": "^0.10",
+    "phpstan/phpstan": "^0.11",
+    "phpstan/phpstan-deprecation-rules": "^0.11",
+    "phpstan/phpstan-strict-rules": "^0.11",
     "phpunit/phpunit": "^6.0|^7.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.10.1"
+    "thecodingmachine/phpstan-strict-rules": "^0.11"
   },
   "suggest": {
   },

diff --git a/src/CommandInflector.php b/src/CommandInflector.php
@@ -16,7 +16,7 @@
 use Gears\CQRS\Command;
 use Gears\CQRS\CommandHandler;
 use Gears\CQRS\Exception\InvalidCommandException;
-use Gears\CQRS\Tactician\Exception\InvalidCommandHandlerException;
+use Gears\CQRS\Exception\InvalidCommandHandlerException;
 use League\Tactician\Handler\MethodNameInflector\MethodNameInflector;
 
 final class CommandInflector implements MethodNameInflector

diff --git a/src/Exception/InvalidCommandHandlerException.php b/src/Exception/InvalidCommandHandlerException.php
diff --git a/src/Exception/InvalidQueryHandlerException.php b/src/Exception/InvalidQueryHandlerException.php
diff --git a/src/Exception/QueryReturnException.php b/src/Exception/QueryReturnException.php
diff --git a/src/QueryBus.php b/src/QueryBus.php
@@ -13,9 +13,9 @@
 
 namespace Gears\CQRS\Tactician;
 
+use Gears\CQRS\Exception\QueryReturnException;
 use Gears\CQRS\Query;
 use Gears\CQRS\QueryBus as QueryBusInterface;
-use Gears\CQRS\Tactician\Exception\QueryReturnException;
 use Gears\DTO\DTO;
 use League\Tactician\CommandBus as TacticianCommandBus;
 

diff --git a/src/QueryInflector.php b/src/QueryInflector.php
@@ -14,9 +14,9 @@
 namespace Gears\CQRS\Tactician;
 
 use Gears\CQRS\Exception\InvalidQueryException;
+use Gears\CQRS\Exception\InvalidQueryHandlerException;
 use Gears\CQRS\Query;
 use Gears\CQRS\QueryHandler;
-use Gears\CQRS\Tactician\Exception\InvalidQueryHandlerException;
 use League\Tactician\Handler\MethodNameInflector\MethodNameInflector;
 
 final class QueryInflector implements MethodNameInflector

diff --git a/tests/Tactician/CommandInflectorTest.php b/tests/Tactician/CommandInflectorTest.php
@@ -33,7 +33,7 @@ public function testInvalidCommand(): void
     }
 
     /**
-     * @expectedException \Gears\CQRS\Tactician\Exception\InvalidCommandHandlerException
+     * @expectedException \Gears\CQRS\Exception\InvalidCommandHandlerException
      * @expectedExceptionMessage Command handler must implement Gears\CQRS\CommandHandler interface, string given
      */
     public function testInvalidCommandHandler(): void

diff --git a/tests/Tactician/QueryBusTest.php b/tests/Tactician/QueryBusTest.php
@@ -38,7 +38,7 @@ public function testHandling(): void
     }
 
     /**
-     * @expectedException \Gears\CQRS\Tactician\Exception\QueryReturnException
+     * @expectedException \Gears\CQRS\Exception\QueryReturnException
      * @expectedExceptionMessageRegExp /^Query handler for .+\\QueryStub should return an instance of Gears\\DTO\\DTO$/
      */
     public function testInvalidReturn(): void

diff --git a/tests/Tactician/QueryInflectorTest.php b/tests/Tactician/QueryInflectorTest.php
@@ -33,7 +33,7 @@ public function testInvalidCommand(): void
     }
 
     /**
-     * @expectedException \Gears\CQRS\Tactician\Exception\InvalidQueryHandlerException
+     * @expectedException \Gears\CQRS\Exception\InvalidQueryHandlerException
      * @expectedExceptionMessage Query handler must implement Gears\CQRS\QueryHandler interface, string given
      */
     public function testInvalidCommandHandler(): void