Merge pull request #96 from boekkooi/exceptional-exceptions

Exceptional exceptions
thephpleague · Feb 19, 2016 · cda5b1e · cda5b1e
2 parents 9b0e554 + 6f75e36
commit cda5b1e
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 8 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -9,6 +9,7 @@
          processIsolation="false"
          stopOnFailure="false"
          syntaxCheck="false"
+         bootstrap="vendor/autoload.php"
         >
 
     <listeners>

diff --git a/src/Exception/CanNotDetermineCommandNameException.php b/src/Exception/CanNotDetermineCommandNameException.php
@@ -8,18 +8,20 @@
 class CanNotDetermineCommandNameException extends \RuntimeException implements Exception
 {
     /**
-     * @var object
+     * @var mixed
      */
     private $command;
 
     /**
-     * @param object $command
+     * @param mixed $command
      *
      * @return static
      */
     public static function forCommand($command)
     {
-        $exception = new static('Could not determine command name of ' . get_class($command));
+        $type =  is_object($command) ? get_class($command) : gettype($command);
+
+        $exception = new static('Could not determine command name of ' . $type);
         $exception->command = $command;
 
         return $exception;
@@ -28,7 +30,7 @@ public static function forCommand($command)
     /**
      * Returns the command that could not be invoked
      *
-     * @return object
+     * @return mixed
      */
     public function getCommand()
     {

diff --git a/src/Exception/CanNotInvokeHandlerException.php b/src/Exception/CanNotInvokeHandlerException.php
@@ -11,20 +11,22 @@
 class CanNotInvokeHandlerException extends \BadMethodCallException implements Exception
 {
     /**
-     * @var object
+     * @var mixed
      */
     private $command;
 
     /**
-     * @param object $command
+     * @param mixed $command
      * @param string $reason
      *
      * @return static
      */
     public static function forCommand($command, $reason)
     {
+        $type =  is_object($command) ? get_class($command) : gettype($command);
+
         $exception = new static(
-            'Could not invoke handler for command ' . get_class($command) .
+            'Could not invoke handler for command ' . $type .
             ' for reason: ' . $reason
         );
         $exception->command = $command;
@@ -35,7 +37,7 @@ public static function forCommand($command, $reason)
     /**
      * Returns the command that could not be invoked
      *
-     * @return object
+     * @return mixed
      */
     public function getCommand()
     {

diff --git a/tests/Exception/CanNotDetermineCommandNameExceptionTest.php b/tests/Exception/CanNotDetermineCommandNameExceptionTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tactician\CommandBus\Tests\Exception;
+
+use League\Tactician\Exception\CanNotDetermineCommandNameException;
+
+class CanNotDetermineCommandNameExceptionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideAnyTypeOfCommand
+     */
+    public function testForAnyTypeOfCommand($command)
+    {
+        $exception = CanNotDetermineCommandNameException::forCommand($command);
+        $this->assertSame($command, $exception->getCommand());
+    }
+
+    public function provideAnyTypeOfCommand()
+    {
+        return [
+            [ 1 ],
+            [ new \stdClass() ],
+            [ null ],
+            [ 'a string' ],
+            [ new \SplFileInfo(__FILE__) ],
+            [ true ],
+            [ false ],
+            [ [] ],
+            [ [ [ 1 ] ] ],
+            [
+                function () {
+                }
+            ],
+        ];
+    }
+}
diff --git a/tests/Exception/CanNotInvokeHandlerExceptionTest.php b/tests/Exception/CanNotInvokeHandlerExceptionTest.php
@@ -19,4 +19,32 @@ public function testExceptionContainsDebuggingInfo()
         $this->assertSame($command, $exception->getCommand());
         $this->assertInstanceOf(Exception::class, $exception);
     }
+
+    /**
+     * @dataProvider provideAnyTypeOfCommand
+     */
+    public function testForAnyTypeOfCommand($command)
+    {
+        $exception = CanNotInvokeHandlerException::forCommand($command, 'happens');
+        $this->assertSame($command, $exception->getCommand());
+    }
+
+    public function provideAnyTypeOfCommand()
+    {
+        return [
+            [ 1 ],
+            [ new \stdClass() ],
+            [ null ],
+            [ 'a string' ],
+            [ new \SplFileInfo(__FILE__) ],
+            [ true ],
+            [ false ],
+            [ [] ],
+            [ [ [ 1 ] ] ],
+            [
+                function () {
+                }
+            ],
+        ];
+    }
 }