Breaking Change: Configured defaults for DaemonRunCommand and reordered constructor parameters.

Author: Andrew Carter

src/Command/DaemonRunCommand.php

@@ -2,6 +2,7 @@
 
 namespace PHPFastCGI\FastCGIDaemon\Command;
 
+use PHPFastCGI\FastCGIDaemon\DaemonFactory;
 use PHPFastCGI\FastCGIDaemon\DaemonFactoryInterface;
 use PHPFastCGI\FastCGIDaemon\KernelInterface;
 use Symfony\Component\Console\Command\Command;
@@ -12,6 +13,9 @@
 
 class DaemonRunCommand extends Command
 {
+    const DEFAULT_NAME        = 'run';
+    const DEFAULT_DESCRIPTION = 'Run the FastCGI daemon';
+
     /**
      * @var DaemonFactoryInterface
      */
@@ -25,13 +29,17 @@ class DaemonRunCommand extends Command
     /**
      * Constructor.
      *
+     * @param KernelInterface|callable $kernel        The kernel to be given to the daemon
+     * @param DaemonFactoryInterface   $daemonFactory The factory to use to create the daemon
      * @param string                   $name          The name of the daemon run command
      * @param string                   $description   The description of the daemon run command
-     * @param DaemonFactoryInterface   $daemonFactory The factory to use to create the daemon
-     * @param KernelInterface|callable $kernel        The kernel to be given to the daemon
      */
-    public function __construct($name, $description, DaemonFactoryInterface $daemonFactory, $kernel)
+    public function __construct($kernel, DaemonFactoryInterface $daemonFactory = null, $name = null, $description = null)
     {
+        $daemonFactory = ($daemonFactory === null) ? new DaemonFactory         : $daemonFactory;
+        $name          = ($name          === null) ? self::DEFAULT_NAME        : $name;
+        $description   = ($description   === null) ? self::DEFAULT_DESCRIPTION : $description;
+
         parent::__construct($name);
 
         $this

test/Command/DaemonRunCommandTest.php

@@ -20,7 +20,7 @@ class DaemonRunCommandTest extends \PHPUnit_Framework_TestCase
      */
     public function testInvalidArgumentException()
     {
-        new DaemonRunCommand('name', 'description', new DaemonFactory(), 'not a callable function');
+        new DaemonRunCommand('not a callable function');
     }
 
     /**
@@ -29,7 +29,7 @@ public function testInvalidArgumentException()
      */
     public function testOptions()
     {
-        $command = new DaemonRunCommand('name', 'description', new DaemonFactory(), function () { });
+        $command = new DaemonRunCommand(function () { });
 
         $definition = $command->getDefinition();
 
@@ -48,7 +48,7 @@ public function testOptions()
      */
     public function testInvalidOptions()
     {
-        $command = new DaemonRunCommand('name', 'description', new DaemonFactory(), function () { });
+        $command = new DaemonRunCommand(function () { });
 
         $input  = new ArrayInput(['--host' => '_']);
         $output = new NullOutput();
@@ -103,7 +103,7 @@ public function testCreateDefaultDaemon()
             ->method('createDaemon')
             ->will($this->returnValue($mockDaemon));
 
-        $command = new DaemonRunCommand('name', 'description', $mockDaemonFactory, function () { });
+        $command = new DaemonRunCommand(function () { }, $mockDaemonFactory);
 
         $command->run($input, $output);
     }
@@ -130,7 +130,7 @@ public function testCreateTcpDaemonWithHost()
             ->with($this->equalTo($kernel), $this->equalTo($port), $this->equalTo($host))
             ->will($this->returnValue($mockDaemon));
 
-        $command = new DaemonRunCommand('name', 'description', $mockDaemonFactory, $kernel);
+        $command = new DaemonRunCommand($kernel, $mockDaemonFactory);
 
         $command->run($input, $output);
     }
@@ -156,7 +156,7 @@ public function testCreateTcpDaemonWithoutHost()
             ->with($this->equalTo($kernel), $this->equalTo($port), $this->equalTo('localhost'))
             ->will($this->returnValue($mockDaemon));
 
-        $command = new DaemonRunCommand('name', 'description', $mockDaemonFactory, $kernel);
+        $command = new DaemonRunCommand($kernel, $mockDaemonFactory);
 
         $command->run($input, $output);
     }