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"]
+}

phpunit/phpunit/4.7/tests/.gitignore

@@ -0,0 +1 @@
+../../../3.3/config/packages/cache.yaml

symfony/console/5.1/bin/console

@@ -0,0 +1,15 @@
+framework:
+    #csrf_protection: true
+    #http_method_override: true
+
+    # Enables session support. Note that the session will ONLY be started if you read or write from it.
+    # Remove or comment this section to explicitly disable session support.
+    session:
+        handler_id: null
+        cookie_secure: auto
+        cookie_samesite: lax
+
+    #esi: true
+    #fragments: true
+    php_errors:
+        log: true

symfony/console/5.1/manifest.json

@@ -0,0 +1 @@
+../../../4.2/config/packages/test/

symfony/framework-bundle/5.1/config

@@ -0,0 +1 @@
+../../4.4/config/routes/

symfony/framework-bundle/5.1/config/packages/cache.yaml

@@ -0,0 +1 @@
+../../4.2/config/services.yaml

symfony/framework-bundle/5.1/config/packages/framework.yaml

@@ -1 +1 @@
-../4.4/manifest.json
+../4.2/manifest.json

symfony/framework-bundle/5.1/config/packages/test

@@ -1 +1 @@
-../4.4/post-install.txt
+../4.2/post-install.txt

symfony/framework-bundle/5.1/config/routes

@@ -0,0 +1,30 @@
+<?php
+
+use App\Kernel;
+use Symfony\Component\Dotenv\Dotenv;
+use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\HttpFoundation\Request;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+
+if ($_SERVER['APP_DEBUG']) {
+    umask(0000);
+
+    Debug::enable();
+}
+
+if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
+    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
+}
+
+if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
+    Request::setTrustedHosts([$trustedHosts]);
+}
+
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$request = Request::createFromGlobals();
+$response = $kernel->handle($request);
+$response->send();
+$kernel->terminate($request, $response);

symfony/framework-bundle/5.1/config/services.yaml

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

symfony/framework-bundle/5.1/manifest.json

@@ -0,0 +1,11 @@
+<?php
+
+use Symfony\Component\Dotenv\Dotenv;
+
+require dirname(__DIR__).'/vendor/autoload.php';
+
+if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
+    require dirname(__DIR__).'/config/bootstrap.php';
+} elseif (method_exists(Dotenv::class, 'bootEnv')) {
+    (new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
+}

symfony/framework-bundle/5.1/post-install.txt

@@ -0,0 +1 @@
+../3.3/config/

symfony/framework-bundle/5.1/public

@@ -0,0 +1 @@
+../3.3/manifest.json

symfony/framework-bundle/5.1/public/index.php

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

symfony/phpunit-bridge/3.3/config/bootstrap.php

@@ -0,0 +1 @@
+../3.3/post-install.txt

symfony/phpunit-bridge/3.3/phpunit.xml.dist

@@ -0,0 +1 @@
+../3.3/tests/

symfony/phpunit-bridge/3.3/tests/.gitignore

@@ -0,0 +1 @@
+../3.3/config/

symfony/phpunit-bridge/3.3/tests/bootstrap.php

@@ -1 +1 @@
-../4.2/manifest.json
+../3.3/manifest.json

symfony/phpunit-bridge/4.1/config

@@ -1 +1 @@
-../4.2/phpunit.xml.dist
+../4.1/phpunit.xml.dist

symfony/phpunit-bridge/4.1/config/bootstrap.php

@@ -1 +1 @@
-../4.2/post-install.txt
+../3.3/post-install.txt

symfony/phpunit-bridge/4.1/manifest.json

@@ -0,0 +1 @@
+../3.3/tests/