Moved default values into DaemonRunCommand

Andrew Carter · Andrew Carter · commit 195ecd3303cc · 2015-08-14T09:12:47.000+01:00
diff --git a/src/ApplicationFactory.php b/src/ApplicationFactory.php
@@ -21,17 +21,13 @@ class ApplicationFactory implements ApplicationFactoryInterface
      */
     public function __construct(DaemonFactoryInterface $daemonFactory = null)
     {
-        if (null === $daemonFactory) {
-            $this->daemonFactory = new DaemonFactory;
-        } else {
-            $this->daemonFactory = $daemonFactory;
-        }
+        $this->daemonFactory = $daemonFactory;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function createApplication($kernel, $commandName = 'run', $commandDescription = 'Run a FastCGI daemon')
+    public function createApplication($kernel, $commandName = null, $commandDescription = null)
     {
         $command = $this->createCommand($kernel, $commandName, $commandDescription);
 
@@ -44,8 +40,8 @@ public function createApplication($kernel, $commandName = 'run', $commandDescrip
     /**
      * {@inheritdoc}
      */
-    public function createCommand($kernel, $commandName = 'run', $commandDescription = 'Run a FastCGI daemon')
+    public function createCommand($kernel, $commandName = null, $commandDescription = null)
     {
-        return new DaemonRunCommand($commandName, $commandDescription, $this->daemonFactory, $kernel);
+        return new DaemonRunCommand($kernel, $this->daemonFactory, $commandName, $commandDescription);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,17 +21,13 @@ class ApplicationFactory implements ApplicationFactoryInterface`
`21`	`21`	`*/`
`22`	`22`	`public function __construct(DaemonFactoryInterface $daemonFactory = null)`
`23`	`23`	`{`
`24`		`- if (null === $daemonFactory) {`
`25`		`- $this->daemonFactory = new DaemonFactory;`
`26`		`- } else {`
`27`		`- $this->daemonFactory = $daemonFactory;`
`28`		`- }`
	`24`	`+ $this->daemonFactory = $daemonFactory;`
`29`	`25`	`}`
`30`	`26`
`31`	`27`	`/**`
`32`	`28`	`* {@inheritdoc}`
`33`	`29`	`*/`
`34`		`- public function createApplication($kernel, $commandName = 'run', $commandDescription = 'Run a FastCGI daemon')`
	`30`	`+ public function createApplication($kernel, $commandName = null, $commandDescription = null)`
`35`	`31`	`{`
`36`	`32`	`$command = $this->createCommand($kernel, $commandName, $commandDescription);`
`37`	`33`
`@@ -44,8 +40,8 @@ public function createApplication($kernel, $commandName = 'run', $commandDescrip`
`44`	`40`	`/**`
`45`	`41`	`* {@inheritdoc}`
`46`	`42`	`*/`
`47`		`- public function createCommand($kernel, $commandName = 'run', $commandDescription = 'Run a FastCGI daemon')`
	`43`	`+ public function createCommand($kernel, $commandName = null, $commandDescription = null)`
`48`	`44`	`{`
`49`		`- return new DaemonRunCommand($commandName, $commandDescription, $this->daemonFactory, $kernel);`
	`45`	`+ return new DaemonRunCommand($kernel, $this->daemonFactory, $commandName, $commandDescription);`
`50`	`46`	`}`
`51`	`47`	`}`