From f54d6a468405d0d8d27b0e790dc09a01e337777a Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 22 Nov 2018 16:07:00 +0100 Subject: [PATCH] Move src/.bootstrap.php to config/bootstrap.php --- behat/symfony2-extension/2.1/config/bootstrap.php | 1 + behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php | 2 +- behat/symfony2-extension/2.1/manifest.json | 4 ++-- behat/symfony2-extension/2.1/src/.bootstrap.php | 1 - phpunit/phpunit/4.7/config/bootstrap.php | 1 + phpunit/phpunit/4.7/manifest.json | 2 +- phpunit/phpunit/4.7/phpunit.xml.dist | 2 +- phpunit/phpunit/4.7/src/.bootstrap.php | 1 - symfony/console/3.3/bin/console | 2 +- symfony/console/3.3/config/bootstrap.php | 1 + symfony/console/3.3/manifest.json | 2 +- symfony/console/3.3/src/.bootstrap.php | 1 - .../3.3/{src/.bootstrap.php => config/bootstrap.php} | 0 symfony/framework-bundle/3.3/public/index.php | 2 +- .../4.2/{src/.bootstrap.php => config/bootstrap.php} | 0 symfony/framework-bundle/4.2/public/index.php | 2 +- symfony/phpunit-bridge/3.3/config/bootstrap.php | 1 + symfony/phpunit-bridge/3.3/manifest.json | 1 - symfony/phpunit-bridge/3.3/phpunit.xml.dist | 2 +- symfony/phpunit-bridge/3.3/src/.bootstrap.php | 1 - symfony/phpunit-bridge/4.1/config/bootstrap.php | 1 + symfony/phpunit-bridge/4.1/manifest.json | 2 +- symfony/phpunit-bridge/4.1/src/.bootstrap.php | 1 - 23 files changed, 16 insertions(+), 17 deletions(-) create mode 120000 behat/symfony2-extension/2.1/config/bootstrap.php delete mode 120000 behat/symfony2-extension/2.1/src/.bootstrap.php create mode 120000 phpunit/phpunit/4.7/config/bootstrap.php delete mode 120000 phpunit/phpunit/4.7/src/.bootstrap.php create mode 120000 symfony/console/3.3/config/bootstrap.php delete mode 120000 symfony/console/3.3/src/.bootstrap.php rename symfony/framework-bundle/3.3/{src/.bootstrap.php => config/bootstrap.php} (100%) rename symfony/framework-bundle/4.2/{src/.bootstrap.php => config/bootstrap.php} (100%) create mode 120000 symfony/phpunit-bridge/3.3/config/bootstrap.php delete mode 120000 symfony/phpunit-bridge/3.3/src/.bootstrap.php create mode 120000 symfony/phpunit-bridge/4.1/config/bootstrap.php delete mode 120000 symfony/phpunit-bridge/4.1/src/.bootstrap.php diff --git a/behat/symfony2-extension/2.1/config/bootstrap.php b/behat/symfony2-extension/2.1/config/bootstrap.php new file mode 120000 index 000000000..57ba1e6e0 --- /dev/null +++ b/behat/symfony2-extension/2.1/config/bootstrap.php @@ -0,0 +1 @@ +../../../../symfony/framework-bundle/3.3/config/bootstrap.php \ No newline at end of file diff --git a/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php b/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php index 97871bbdb..0f3ad18d3 100644 --- a/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php +++ b/behat/symfony2-extension/2.1/features/bootstrap/bootstrap.php @@ -1,4 +1,4 @@ diff --git a/phpunit/phpunit/4.7/src/.bootstrap.php b/phpunit/phpunit/4.7/src/.bootstrap.php deleted file mode 120000 index 02c7cfb74..000000000 --- a/phpunit/phpunit/4.7/src/.bootstrap.php +++ /dev/null @@ -1 +0,0 @@ -../../../../symfony/framework-bundle/3.3/src/.bootstrap.php \ No newline at end of file diff --git a/symfony/console/3.3/bin/console b/symfony/console/3.3/bin/console index 0d0ea9fb1..3d99d4638 100755 --- a/symfony/console/3.3/bin/console +++ b/symfony/console/3.3/bin/console @@ -25,7 +25,7 @@ if ($input->hasParameterOption('--no-debug', true)) { putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0'); } -require dirname(__DIR__).'/src/.bootstrap.php'; +require dirname(__DIR__).'/config/bootstrap.php'; if ($_SERVER['APP_DEBUG']) { umask(0000); diff --git a/symfony/console/3.3/config/bootstrap.php b/symfony/console/3.3/config/bootstrap.php new file mode 120000 index 000000000..57ba1e6e0 --- /dev/null +++ b/symfony/console/3.3/config/bootstrap.php @@ -0,0 +1 @@ +../../../../symfony/framework-bundle/3.3/config/bootstrap.php \ No newline at end of file diff --git a/symfony/console/3.3/manifest.json b/symfony/console/3.3/manifest.json index 66f423396..c00421d61 100644 --- a/symfony/console/3.3/manifest.json +++ b/symfony/console/3.3/manifest.json @@ -1,7 +1,7 @@ { "copy-from-recipe": { "bin/": "%BIN_DIR%/", - "src/": "%SRC_DIR%/" + "config/": "%CONFIG_DIR%/" }, "aliases": ["cli"] } diff --git a/symfony/console/3.3/src/.bootstrap.php b/symfony/console/3.3/src/.bootstrap.php deleted file mode 120000 index 02c7cfb74..000000000 --- a/symfony/console/3.3/src/.bootstrap.php +++ /dev/null @@ -1 +0,0 @@ -../../../../symfony/framework-bundle/3.3/src/.bootstrap.php \ No newline at end of file diff --git a/symfony/framework-bundle/3.3/src/.bootstrap.php b/symfony/framework-bundle/3.3/config/bootstrap.php similarity index 100% rename from symfony/framework-bundle/3.3/src/.bootstrap.php rename to symfony/framework-bundle/3.3/config/bootstrap.php diff --git a/symfony/framework-bundle/3.3/public/index.php b/symfony/framework-bundle/3.3/public/index.php index 9b4b36b41..f0a3f2544 100644 --- a/symfony/framework-bundle/3.3/public/index.php +++ b/symfony/framework-bundle/3.3/public/index.php @@ -4,7 +4,7 @@ use Symfony\Component\Debug\Debug; use Symfony\Component\HttpFoundation\Request; -require dirname(__DIR__).'/src/.bootstrap.php'; +require dirname(__DIR__).'/config/bootstrap.php'; if ($_SERVER['APP_DEBUG']) { umask(0000); diff --git a/symfony/framework-bundle/4.2/src/.bootstrap.php b/symfony/framework-bundle/4.2/config/bootstrap.php similarity index 100% rename from symfony/framework-bundle/4.2/src/.bootstrap.php rename to symfony/framework-bundle/4.2/config/bootstrap.php diff --git a/symfony/framework-bundle/4.2/public/index.php b/symfony/framework-bundle/4.2/public/index.php index 9b4b36b41..f0a3f2544 100644 --- a/symfony/framework-bundle/4.2/public/index.php +++ b/symfony/framework-bundle/4.2/public/index.php @@ -4,7 +4,7 @@ use Symfony\Component\Debug\Debug; use Symfony\Component\HttpFoundation\Request; -require dirname(__DIR__).'/src/.bootstrap.php'; +require dirname(__DIR__).'/config/bootstrap.php'; if ($_SERVER['APP_DEBUG']) { umask(0000); diff --git a/symfony/phpunit-bridge/3.3/config/bootstrap.php b/symfony/phpunit-bridge/3.3/config/bootstrap.php new file mode 120000 index 000000000..57ba1e6e0 --- /dev/null +++ b/symfony/phpunit-bridge/3.3/config/bootstrap.php @@ -0,0 +1 @@ +../../../../symfony/framework-bundle/3.3/config/bootstrap.php \ No newline at end of file diff --git a/symfony/phpunit-bridge/3.3/manifest.json b/symfony/phpunit-bridge/3.3/manifest.json index 8a865563b..6a0aab996 100644 --- a/symfony/phpunit-bridge/3.3/manifest.json +++ b/symfony/phpunit-bridge/3.3/manifest.json @@ -4,7 +4,6 @@ "bin/": "%BIN_DIR%/", "config/": "%CONFIG_DIR%/", "phpunit.xml.dist": "phpunit.xml.dist", - "src/": "%SRC_DIR%/", "tests/": "tests/" }, "gitignore": [ diff --git a/symfony/phpunit-bridge/3.3/phpunit.xml.dist b/symfony/phpunit-bridge/3.3/phpunit.xml.dist index ef4352ef1..134c69e92 100644 --- a/symfony/phpunit-bridge/3.3/phpunit.xml.dist +++ b/symfony/phpunit-bridge/3.3/phpunit.xml.dist @@ -5,7 +5,7 @@ xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.5/phpunit.xsd" backupGlobals="false" colors="true" - bootstrap="src/.bootstrap.php" + bootstrap="config/bootstrap.php" > diff --git a/symfony/phpunit-bridge/3.3/src/.bootstrap.php b/symfony/phpunit-bridge/3.3/src/.bootstrap.php deleted file mode 120000 index 02c7cfb74..000000000 --- a/symfony/phpunit-bridge/3.3/src/.bootstrap.php +++ /dev/null @@ -1 +0,0 @@ -../../../../symfony/framework-bundle/3.3/src/.bootstrap.php \ No newline at end of file diff --git a/symfony/phpunit-bridge/4.1/config/bootstrap.php b/symfony/phpunit-bridge/4.1/config/bootstrap.php new file mode 120000 index 000000000..57ba1e6e0 --- /dev/null +++ b/symfony/phpunit-bridge/4.1/config/bootstrap.php @@ -0,0 +1 @@ +../../../../symfony/framework-bundle/3.3/config/bootstrap.php \ No newline at end of file diff --git a/symfony/phpunit-bridge/4.1/manifest.json b/symfony/phpunit-bridge/4.1/manifest.json index b28ff9ffc..6a0aab996 100644 --- a/symfony/phpunit-bridge/4.1/manifest.json +++ b/symfony/phpunit-bridge/4.1/manifest.json @@ -2,8 +2,8 @@ "copy-from-recipe": { ".env.test": ".env.test", "bin/": "%BIN_DIR%/", + "config/": "%CONFIG_DIR%/", "phpunit.xml.dist": "phpunit.xml.dist", - "src/": "%SRC_DIR%/", "tests/": "tests/" }, "gitignore": [ diff --git a/symfony/phpunit-bridge/4.1/src/.bootstrap.php b/symfony/phpunit-bridge/4.1/src/.bootstrap.php deleted file mode 120000 index 02c7cfb74..000000000 --- a/symfony/phpunit-bridge/4.1/src/.bootstrap.php +++ /dev/null @@ -1 +0,0 @@ -../../../../symfony/framework-bundle/3.3/src/.bootstrap.php \ No newline at end of file