bug #16871 [FrameworkBundle] Disable built-in server commands when Process component is missing (gnugat, xabbuh)

fabpot · fabpot · commit b8fbe69bb88d · 2015-12-07T22:55:06.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle] Disable built-in server commands when Process component is missing | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | This also backports the improvement for the `suggest` section from #16650 to the `2.7` branch and improves it by also mentioning the other built-in server commands. Commits ------- 972c4ca disable server commands without Process component dd82b64 list all server command names in suggestion d18fb9b Suggested Process dependency
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerCommand.php
@@ -27,6 +27,10 @@ public function isEnabled()
             return false;
         }
 
+        if (!class_exists('Symfony\Component\Process\Process')) {
+            return false;
+        }
+
         return parent::isEnabled();
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -25,22 +25,6 @@
  */
 class ServerRunCommand extends ServerCommand
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function isEnabled()
-    {
-        if (PHP_VERSION_ID < 50400 || defined('HHVM_VERSION')) {
-            return false;
-        }
-
-        if (!class_exists('Symfony\Component\Process\Process')) {
-            return false;
-        }
-
-        return parent::isEnabled();
-    }
-
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -54,7 +54,7 @@
         "symfony/serializer": "For using the serializer service",
         "symfony/validator": "For using validation",
         "symfony/yaml": "For using the debug:config and lint:yaml commands",
-        "symfony/process": "For using the server:run command",
+        "symfony/process": "For using the server:run, server:start, server:stop, and server:status commands",
         "doctrine/cache": "For using alternative cache drivers"
     },
     "autoload": {

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ public function isEnabled()`
`27`	`27`	`return false;`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ if (!class_exists('Symfony\Component\Process\Process')) {`
	`31`	`+ return false;`
	`32`	`+ }`
	`33`	`+`
`30`	`34`	`return parent::isEnabled();`
`31`	`35`	`}`
`32`	`36`