Merge pull request #724

Author: symfony-flex-server[bot]

behat/symfony2-extension/2.1/config/bootstrap.php

@@ -1,4 +1,11 @@
 <?php
 
+use Symfony\Component\Dotenv\Dotenv;
+
 putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = 'test');
-require dirname(__DIR__, 2).'/config/bootstrap.php';
+
+if (file_exists(dirname(__DIR__, 2).'/config/bootstrap.php')) {
+    require dirname(__DIR__, 2).'/config/bootstrap.php';
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__, 2).'/.env');
+}

behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php

@@ -1,7 +1,6 @@
 {
     "copy-from-recipe": {
         "behat.yml.dist": "behat.yml.dist",
-        "config/": "%CONFIG_DIR%/",
         "features/": "features/"
     },
     "aliases": ["behat"],

behat/symfony2-extension/2.1/manifest.json

@@ -2,7 +2,6 @@
     "copy-from-recipe": {
         ".env.test": ".env.test",
         "phpunit.xml.dist": "phpunit.xml.dist",
-        "config/": "%CONFIG_DIR%/",
         "tests/": "tests/"
     },
     "gitignore": [

phpunit/phpunit/4.7/config/bootstrap.php

@@ -5,7 +5,7 @@
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="config/bootstrap.php"
+         bootstrap="tests/bootstrap.php"
 >
     <php>
         <ini name="error_reporting" value="-1" />

phpunit/phpunit/4.7/manifest.json

@@ -0,0 +1 @@
+../../../symfony/phpunit-bridge/3.3/tests/

phpunit/phpunit/4.7/phpunit.xml.dist

@@ -0,0 +1,43 @@
+#!/usr/bin/env php
+<?php
+
+use App\Kernel;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\ErrorHandler\Debug;
+
+if (!in_array(PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
+}
+
+set_time_limit(0);
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (!class_exists(Application::class) || !class_exists(Dotenv::class)) {
+    throw new LogicException('You need to add "symfony/framework-bundle" and "symfony/dotenv" as Composer dependencies.');
+}
+
+$input = new ArgvInput();
+if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
+    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
+}
+
+if ($input->hasParameterOption('--no-debug', true)) {
+    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
+}
+
+(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    if (class_exists(Debug::class)) {
+        Debug::enable();
+    }
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$application = new Application($kernel);
+$application->run($input);

phpunit/phpunit/4.7/tests

@@ -0,0 +1,6 @@
+{
+    "copy-from-recipe": {
+        "bin/": "%BIN_DIR%/"
+    },
+    "aliases": ["cli"]
+}