Update to Symfony 3.4 as minimum. (#3697)

* Update to Symfony 3.4 as minimum.

Drops support for Symfony 2 which was used in Drupal 8.3 and prior.

* Use new env variable feature of Process 3.1

Author: weitzman

composer.json

@@ -43,13 +43,13 @@
     "league/container": "~2",
     "psr/log": "~1.0",
     "psy/psysh": "~0.6",
-    "symfony/config": "~2.2|^3",
-    "symfony/console": "~2.7|^3",
-    "symfony/event-dispatcher": "~2.7|^3",
-    "symfony/finder": "~2.7|^3",
-    "symfony/process": "~2.7|^3",
-    "symfony/var-dumper": "~2.7|^3|^4",
-    "symfony/yaml": "~2.3|^3",
+    "symfony/config": "^3.4",
+    "symfony/console": "^3.4",
+    "symfony/event-dispatcher": "^3.4",
+    "symfony/finder": "^3.4",
+    "symfony/process": "^3.4",
+    "symfony/var-dumper": "^3.4",
+    "symfony/yaml": "^3.4",
     "webflo/drupal-finder": "^1.1",
     "webmozart/path-util": "^2.1.0"
   },

scenarios/isolation-phpunit4/composer.json

@@ -35,8 +35,8 @@
     "consolidation/config": "^1.1.0",
     "consolidation/site-alias": "^1.1.5",
     "psr/log": "~1.0",
-    "symfony/finder": "~2.7|^3",
-    "symfony/var-dumper": "~2.7|^3|^4",
+    "symfony/finder": "^3.4",
+    "symfony/var-dumper": "^3.4",
     "webflo/drupal-finder": "^1.1",
     "webmozart/path-util": "^2.1.0"
   },

scenarios/isolation/composer.json

@@ -35,8 +35,8 @@
     "consolidation/config": "^1.1.0",
     "consolidation/site-alias": "^1.1.5",
     "psr/log": "~1.0",
-    "symfony/finder": "~2.7|^3",
-    "symfony/var-dumper": "~2.7|^3|^4",
+    "symfony/finder": "^3.4",
+    "symfony/var-dumper": "^3.4",
     "webflo/drupal-finder": "^1.1",
     "webmozart/path-util": "^2.1.0"
   },

tests/AnnotatedCommandTest.php

@@ -37,10 +37,7 @@ public function testGlobal()
             'directory' => self::getSandbox(),
         ];
 
-        $original = getenv('SHELL_INTERACTIVE');
-        $this->setEnv(['SHELL_INTERACTIVE' => 1]);
-        $this->drush('generate', ['foo-example'], $options);
-        $this->setEnv(['SHELL_INTERACTIVE' => $original]);
+        $this->drush('generate', ['foo-example'], $options, null, null, self::EXIT_SUCCESS, null, ['SHELL_INTERACTIVE' => 1]);
 
         $target = Path::join($options['directory'], 'foo.php');
         $actual = trim(file_get_contents($target));
@@ -86,10 +83,7 @@ public function testExecute()
         ]);
         $optionsExample['directory'] = self::webrootSlashDrush();
         $optionsExample['yes'] = null;
-        $original = getenv('SHELL_INTERACTIVE');
-        $this->setEnv(['SHELL_INTERACTIVE' => 1]);
-        $this->drush('generate', ['woot-example'], $optionsExample);
-        $this->setEnv(['SHELL_INTERACTIVE' => $original]);
+        $this->drush('generate', ['woot-example'], $optionsExample, null, null, self::EXIT_SUCCESS, null, ['SHELL_INTERACTIVE' => 1]);
         $target = Path::join($optionsExample['directory'], 'Commands/ExampleBarCommands.php');
         $actual = trim(file_get_contents($target));
         $this->assertEquals('ExampleBarCommands says Woot mightily.', $actual);

tests/CommandUnishTestCase.php

@@ -216,8 +216,6 @@ public function getOutputFromJSON($key = null)
    * @param sting cd
    *   The directory to run the command in.
    * @param array $env
-   *  @todo: Not fully implemented yet. Inheriting environment is hard - http://stackoverflow.com/questions/3780866/why-is-my-env-empty.
-   *         @see drush_env().
    *  Extra environment variables.
    * @param string $input
    *   A string representing the STDIN that is piped to the command.
@@ -226,7 +224,6 @@ public function getOutputFromJSON($key = null)
    */
     public function execute($command, $expected_return = self::EXIT_SUCCESS, $cd = null, $env = null, $input = null)
     {
-        $return = 1;
         $this->tick();
 
         // Apply the environment variables we need for our test to the head of the
@@ -245,7 +242,8 @@ public function execute($command, $expected_return = self::EXIT_SUCCESS, $cd = n
 
         try {
             // Process uses a default timeout of 60 seconds, set it to 0 (none).
-            $this->process = new Process($command, $cd, null, $input, 0);
+            $this->process = new Process($command, $cd, $env, $input, 0);
+            $this->process->inheritEnvironmentVariables(true);
             if (!getenv('UNISH_NO_TIMEOUTS')) {
                 $this->process->setTimeout($this->timeout)
                 ->setIdleTimeout($this->idleTimeout);

tests/UnishTestCase.php

@@ -651,8 +651,6 @@ public function drupalSitewideDirectory()
      *
      * @param array $vars
      *   The variables to set.
-     *
-     *   We will change implementation to take advantage of https://github.com/symfony/symfony/pull/19053/files once we drop Symfony 2 compat.
      */
     public static function setEnv(array $vars)
     {

tests/UserTest.php

@@ -122,10 +122,7 @@ public function testUserCancel()
             'rest_configuration' => 'no',
         ];
         $answers = json_encode($answers);
-        $original = getenv('SHELL_INTERACTIVE');
-        $this->setEnv(['SHELL_INTERACTIVE' => 1]);
-        $this->drush('generate', ['content-entity'], ['answers' => $answers, 'directory' => Path::join(self::webroot(), 'modules/contrib')]);
-        $this->setEnv(['SHELL_INTERACTIVE' => $original]);
+        $this->drush('generate', ['content-entity'], ['answers' => $answers, 'directory' => Path::join(self::webroot(), 'modules/contrib')], null, null, self::EXIT_SUCCESS, null, ['SHELL_INTERACTIVE' => 1]);
         $this->drush('pm-enable', ['text,unish_article']);
         // Create one unish_article owned by our example user.
         $this->drush('php-script', ['create_unish_articles'], ['script-path' => Path::join(__DIR__, 'resources')]);