From bf2148f9f1fe5af7e19c3145b6f7246c6cabb3a5 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 3 Jul 2017 13:52:44 +0300 Subject: [PATCH 1/2] moved etc/ to config/ and web/ to public/ --- README.rst | 32 +++++++++---------- .../packages/api_platform.yaml | 0 .../{etc => config}/routing/api_platform.yaml | 0 api-platform/core/2.1/manifest.json | 2 +- .../{etc => config}/packages/doctrine.yaml | 0 .../packages/prod/doctrine.yaml | 0 doctrine/doctrine-bundle/1.6/manifest.json | 2 +- .../packages/doctrine_migrations.yaml | 0 .../1.2/manifest.json | 2 +- .../packages/dev/easy-log-handler.yaml | 0 easycorp/easy-log-handler/1.0/manifest.json | 2 +- .../{etc => config}/packages/easy_admin.yaml | 0 .../{etc => config}/routing/easy_admin.yaml | 0 .../easyadmin-bundle/1.16/manifest.json | 2 +- lexik/jwt-authentication-bundle/2.3/Makefile | 2 +- .../packages/lexik_jwt_authentication.yaml | 0 .../2.3/manifest.json | 6 ++-- .../packages/framework_extra.yaml | 0 .../framework-extra-bundle/3.0/manifest.json | 2 +- .../packages/dev/security-checker.yaml | 0 sensiolabs/security-checker/4.0/manifest.json | 2 +- symfony/framework-bundle/3.3/Makefile | 2 +- .../3.3/{etc => config}/container.yaml | 0 .../3.3/{etc => config}/packages/app.yaml | 0 .../{etc => config}/packages/framework.yaml | 0 .../packages/test/framework.yaml | 0 symfony/framework-bundle/3.3/manifest.json | 12 +++---- symfony/framework-bundle/3.3/src/Kernel.php | 6 ++-- .../{etc => config}/packages/dev/monolog.php | 0 .../{etc => config}/packages/prod/monolog.php | 0 symfony/monolog-bundle/3.1/manifest.json | 2 +- .../requirements-checker/1.0/manifest.json | 2 +- .../{etc => config}/packages/dev/routing.yaml | 0 .../3.3/{etc => config}/packages/routing.yaml | 0 .../routing/3.3/{etc => config}/routing.yaml | 0 symfony/routing/3.3/manifest.json | 2 +- .../{etc => config}/packages/security.yaml | 0 symfony/security-bundle/3.3/manifest.json | 2 +- .../packages/dev/swiftmailer.yaml | 0 .../{etc => config}/packages/swiftmailer.yaml | 0 .../packages/test/swiftmailer.yaml | 0 symfony/swiftmailer-bundle/2.5/manifest.json | 2 +- .../{etc => config}/packages/translation.yaml | 0 symfony/translation/3.3/manifest.json | 2 +- .../3.3/{etc => config}/packages/twig.yaml | 0 .../3.3/{etc => config}/routing/dev/twig.yaml | 0 symfony/twig-bundle/3.3/manifest.json | 2 +- .../packages/dev/web_profiler.yaml | 0 .../packages/test/web_profiler.yaml | 0 .../routing/dev/web_profiler.yaml | 0 symfony/web-profiler-bundle/3.3/manifest.json | 2 +- 51 files changed, 45 insertions(+), 45 deletions(-) rename api-platform/core/2.1/{etc => config}/packages/api_platform.yaml (100%) rename api-platform/core/2.1/{etc => config}/routing/api_platform.yaml (100%) rename doctrine/doctrine-bundle/1.6/{etc => config}/packages/doctrine.yaml (100%) rename doctrine/doctrine-bundle/1.6/{etc => config}/packages/prod/doctrine.yaml (100%) rename doctrine/doctrine-migrations-bundle/1.2/{etc => config}/packages/doctrine_migrations.yaml (100%) rename easycorp/easy-log-handler/1.0/{etc => config}/packages/dev/easy-log-handler.yaml (100%) rename javiereguiluz/easyadmin-bundle/1.16/{etc => config}/packages/easy_admin.yaml (100%) rename javiereguiluz/easyadmin-bundle/1.16/{etc => config}/routing/easy_admin.yaml (100%) rename lexik/jwt-authentication-bundle/2.3/{etc => config}/packages/lexik_jwt_authentication.yaml (100%) rename sensio/framework-extra-bundle/3.0/{etc => config}/packages/framework_extra.yaml (100%) rename sensiolabs/security-checker/4.0/{etc => config}/packages/dev/security-checker.yaml (100%) rename symfony/framework-bundle/3.3/{etc => config}/container.yaml (100%) rename symfony/framework-bundle/3.3/{etc => config}/packages/app.yaml (100%) rename symfony/framework-bundle/3.3/{etc => config}/packages/framework.yaml (100%) rename symfony/framework-bundle/3.3/{etc => config}/packages/test/framework.yaml (100%) rename symfony/monolog-bundle/3.1/{etc => config}/packages/dev/monolog.php (100%) rename symfony/monolog-bundle/3.1/{etc => config}/packages/prod/monolog.php (100%) rename symfony/routing/3.3/{etc => config}/packages/dev/routing.yaml (100%) rename symfony/routing/3.3/{etc => config}/packages/routing.yaml (100%) rename symfony/routing/3.3/{etc => config}/routing.yaml (100%) rename symfony/security-bundle/3.3/{etc => config}/packages/security.yaml (100%) rename symfony/swiftmailer-bundle/2.5/{etc => config}/packages/dev/swiftmailer.yaml (100%) rename symfony/swiftmailer-bundle/2.5/{etc => config}/packages/swiftmailer.yaml (100%) rename symfony/swiftmailer-bundle/2.5/{etc => config}/packages/test/swiftmailer.yaml (100%) rename symfony/translation/3.3/{etc => config}/packages/translation.yaml (100%) rename symfony/twig-bundle/3.3/{etc => config}/packages/twig.yaml (100%) rename symfony/twig-bundle/3.3/{etc => config}/routing/dev/twig.yaml (100%) rename symfony/web-profiler-bundle/3.3/{etc => config}/packages/dev/web_profiler.yaml (100%) rename symfony/web-profiler-bundle/3.3/{etc => config}/packages/test/web_profiler.yaml (100%) rename symfony/web-profiler-bundle/3.3/{etc => config}/routing/dev/web_profiler.yaml (100%) diff --git a/README.rst b/README.rst index 94e9819c..40458eed 100644 --- a/README.rst +++ b/README.rst @@ -25,9 +25,9 @@ The following example shows the real directory structure of some Symfony recipes manifest.json framework-bundle/ 3.3/ - etc/ + config/ + public/ src/ - web/ manifest.json requirements-checker/ 1.0/ @@ -96,7 +96,7 @@ The previous recipe is transformed into the following PHP code: .. code-block:: php - // etc/bundles.php + // config/bundles.php return [ 'Symfony\Bundle\DebugBundle\DebugBundle' => ['dev' => true, 'test' => true], 'Symfony\Bundle\MonologBundle\MonologBundle' => ['all' => true], @@ -139,8 +139,8 @@ directory of the application: The ``%BIN_DIR%`` string is a special value that it's turned into the absolute path of the binaries directory of the Symfony application. These are the special -variables available: ``%BIN_DIR%``, ``%CONF_DIR%``, ``%ETC_DIR%``, ``%SRC_DIR%`` -``%VAR_DIR%`` and ``%WEB_DIR%``. You can also access to any variable defined in +variables available: ``%BIN_DIR%``, ``%CONF_DIR%``, ``%CONFIG_DIR%``, ``%SRC_DIR%`` +``%VAR_DIR%`` and ``%PUBLIC_DIR%``. You can also access to any variable defined in the ``extra`` section of your ``composer.json`` file: .. code-block:: json @@ -167,7 +167,7 @@ files and directories: .. code-block:: json "copy-from-recipe": { - "etc/": "%ETC_DIR%/", + "config/": "%CONFIG_DIR%/", "src/": "%SRC_DIR%/" } @@ -233,7 +233,7 @@ script (``php-script`` for PHP scripts, ``script`` for any shell script and "composer-scripts": { "vendor/bin/security-checker security:check": "php-script", "make cache-warmup": "script", - "assets:install --symlink --relative %WEB_DIR%": "symfony-cmd" + "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd" } } @@ -249,9 +249,9 @@ each line): { "gitignore": [ ".env", + "/public/bundles/", "/var/", - "/vendor/", - "/web/bundles/" + "/vendor/" ] } @@ -292,7 +292,7 @@ the recipe: * YAML files suffix must be ``.yaml``, not ``.yml``; * YAML files must be valid; * YAML files must use 4 space indentations; -* YAML files under etc/packages must not define a "parameters" section; +* YAML files under config/packages must not define a "parameters" section; * JSON files must be valid; * JSON files must use 4 space indentations; * Aliases are only supported in the main repository, not the contrib one; @@ -306,7 +306,7 @@ the recipe: * The package must have a registered bundle in the manifest if type is "symfony-bundle"; * The package does not only register a bundle for all environments; * All text files should end with a newline; -* All configuration file names under ``etc`` should use the underscore notation; +* All configuration file names under ``config`` should use the underscore notation; * All files are stored under a directory referenced by the "copy-from-recipe" section of "manifest.json" * The Symfony website must be referenced using HTTPs. @@ -323,13 +323,13 @@ one used by ``symfony/framework-bundle``: "Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/", - "src/": "%SRC_DIR%/", - "web/": "%WEB_DIR%/" + "config/": "%CONFIG_DIR%/", + "public/": "%PUBLIC_DIR%/", + "src/": "%SRC_DIR%/" }, "composer-scripts": { "make cache-warmup": "script", - "assets:install --symlink --relative %WEB_DIR%": "symfony-cmd" + "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd" }, "env": { "APP_ENV": "dev", @@ -338,9 +338,9 @@ one used by ``symfony/framework-bundle``: }, "gitignore": [ ".env", + "/public/bundles/" "/var/", "/vendor/", - "/web/bundles/" ] } diff --git a/api-platform/core/2.1/etc/packages/api_platform.yaml b/api-platform/core/2.1/config/packages/api_platform.yaml similarity index 100% rename from api-platform/core/2.1/etc/packages/api_platform.yaml rename to api-platform/core/2.1/config/packages/api_platform.yaml diff --git a/api-platform/core/2.1/etc/routing/api_platform.yaml b/api-platform/core/2.1/config/routing/api_platform.yaml similarity index 100% rename from api-platform/core/2.1/etc/routing/api_platform.yaml rename to api-platform/core/2.1/config/routing/api_platform.yaml diff --git a/api-platform/core/2.1/manifest.json b/api-platform/core/2.1/manifest.json index 66a54d13..a886a48a 100644 --- a/api-platform/core/2.1/manifest.json +++ b/api-platform/core/2.1/manifest.json @@ -3,7 +3,7 @@ "ApiPlatform\\Core\\Bridge\\Symfony\\Bundle\\ApiPlatformBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/", + "config/": "%CONFIG_DIR%/", "src/": "%SRC_DIR%/" } } diff --git a/doctrine/doctrine-bundle/1.6/etc/packages/doctrine.yaml b/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml similarity index 100% rename from doctrine/doctrine-bundle/1.6/etc/packages/doctrine.yaml rename to doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml diff --git a/doctrine/doctrine-bundle/1.6/etc/packages/prod/doctrine.yaml b/doctrine/doctrine-bundle/1.6/config/packages/prod/doctrine.yaml similarity index 100% rename from doctrine/doctrine-bundle/1.6/etc/packages/prod/doctrine.yaml rename to doctrine/doctrine-bundle/1.6/config/packages/prod/doctrine.yaml diff --git a/doctrine/doctrine-bundle/1.6/manifest.json b/doctrine/doctrine-bundle/1.6/manifest.json index 3c7da9f0..581f1a42 100644 --- a/doctrine/doctrine-bundle/1.6/manifest.json +++ b/doctrine/doctrine-bundle/1.6/manifest.json @@ -3,7 +3,7 @@ "Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/", + "config/": "%CONFIG_DIR%/", "src/": "%SRC_DIR%/" }, "env": { diff --git a/doctrine/doctrine-migrations-bundle/1.2/etc/packages/doctrine_migrations.yaml b/doctrine/doctrine-migrations-bundle/1.2/config/packages/doctrine_migrations.yaml similarity index 100% rename from doctrine/doctrine-migrations-bundle/1.2/etc/packages/doctrine_migrations.yaml rename to doctrine/doctrine-migrations-bundle/1.2/config/packages/doctrine_migrations.yaml diff --git a/doctrine/doctrine-migrations-bundle/1.2/manifest.json b/doctrine/doctrine-migrations-bundle/1.2/manifest.json index 6a1701ea..c68250dc 100644 --- a/doctrine/doctrine-migrations-bundle/1.2/manifest.json +++ b/doctrine/doctrine-migrations-bundle/1.2/manifest.json @@ -3,7 +3,7 @@ "Doctrine\\Bundle\\MigrationsBundle\\DoctrineMigrationsBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/", + "config/": "%CONFIG_DIR%/", "src/": "%SRC_DIR%/" }, "aliases": ["doctrine-migrations", "migrations"] diff --git a/easycorp/easy-log-handler/1.0/etc/packages/dev/easy-log-handler.yaml b/easycorp/easy-log-handler/1.0/config/packages/dev/easy-log-handler.yaml similarity index 100% rename from easycorp/easy-log-handler/1.0/etc/packages/dev/easy-log-handler.yaml rename to easycorp/easy-log-handler/1.0/config/packages/dev/easy-log-handler.yaml diff --git a/easycorp/easy-log-handler/1.0/manifest.json b/easycorp/easy-log-handler/1.0/manifest.json index 9a55513d..e164c6e6 100644 --- a/easycorp/easy-log-handler/1.0/manifest.json +++ b/easycorp/easy-log-handler/1.0/manifest.json @@ -1,5 +1,5 @@ { "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" } } diff --git a/javiereguiluz/easyadmin-bundle/1.16/etc/packages/easy_admin.yaml b/javiereguiluz/easyadmin-bundle/1.16/config/packages/easy_admin.yaml similarity index 100% rename from javiereguiluz/easyadmin-bundle/1.16/etc/packages/easy_admin.yaml rename to javiereguiluz/easyadmin-bundle/1.16/config/packages/easy_admin.yaml diff --git a/javiereguiluz/easyadmin-bundle/1.16/etc/routing/easy_admin.yaml b/javiereguiluz/easyadmin-bundle/1.16/config/routing/easy_admin.yaml similarity index 100% rename from javiereguiluz/easyadmin-bundle/1.16/etc/routing/easy_admin.yaml rename to javiereguiluz/easyadmin-bundle/1.16/config/routing/easy_admin.yaml diff --git a/javiereguiluz/easyadmin-bundle/1.16/manifest.json b/javiereguiluz/easyadmin-bundle/1.16/manifest.json index 10a39605..2c63e8fe 100644 --- a/javiereguiluz/easyadmin-bundle/1.16/manifest.json +++ b/javiereguiluz/easyadmin-bundle/1.16/manifest.json @@ -3,7 +3,7 @@ "JavierEguiluz\\Bundle\\EasyAdminBundle\\EasyAdminBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" }, "aliases": ["admin-gen", "admin-generator", "admin"] } diff --git a/lexik/jwt-authentication-bundle/2.3/Makefile b/lexik/jwt-authentication-bundle/2.3/Makefile index a6992cc0..952640eb 100644 --- a/lexik/jwt-authentication-bundle/2.3/Makefile +++ b/lexik/jwt-authentication-bundle/2.3/Makefile @@ -3,7 +3,7 @@ generate-jwt-keys: ifndef OPENSSL_BIN $(error "Unable to generate keys (needs OpenSSL)") endif - mkdir -p etc/jwt + mkdir -p config/jwt openssl genrsa -passout pass:${JWT_PASSPHRASE} -out ${JWT_PRIVATE_KEY_PATH} -aes256 4096 openssl rsa -passin pass:${JWT_PASSPHRASE} -pubout -in ${JWT_PRIVATE_KEY_PATH} -out ${JWT_PUBLIC_KEY_PATH} @echo "\033[32mRSA key pair successfully generated\033[39m" diff --git a/lexik/jwt-authentication-bundle/2.3/etc/packages/lexik_jwt_authentication.yaml b/lexik/jwt-authentication-bundle/2.3/config/packages/lexik_jwt_authentication.yaml similarity index 100% rename from lexik/jwt-authentication-bundle/2.3/etc/packages/lexik_jwt_authentication.yaml rename to lexik/jwt-authentication-bundle/2.3/config/packages/lexik_jwt_authentication.yaml diff --git a/lexik/jwt-authentication-bundle/2.3/manifest.json b/lexik/jwt-authentication-bundle/2.3/manifest.json index 469fc7eb..a260fddb 100644 --- a/lexik/jwt-authentication-bundle/2.3/manifest.json +++ b/lexik/jwt-authentication-bundle/2.3/manifest.json @@ -3,13 +3,13 @@ "Lexik\\Bundle\\JWTAuthenticationBundle\\LexikJWTAuthenticationBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%" + "config/": "%CONFIG_DIR%" }, "aliases": ["jwt-auth"], "env": { "#1": "Key paths should be relative to the project directory", - "JWT_PRIVATE_KEY_PATH": "%ETC_DIR%/jwt/private.pem", - "JWT_PUBLIC_KEY_PATH": "%ETC_DIR%/jwt/public.pem", + "JWT_PRIVATE_KEY_PATH": "%CONFIG_DIR%/jwt/private.pem", + "JWT_PUBLIC_KEY_PATH": "%CONFIG_DIR%/jwt/public.pem", "JWT_PASSPHRASE": "%generate(secret)%" } } diff --git a/sensio/framework-extra-bundle/3.0/etc/packages/framework_extra.yaml b/sensio/framework-extra-bundle/3.0/config/packages/framework_extra.yaml similarity index 100% rename from sensio/framework-extra-bundle/3.0/etc/packages/framework_extra.yaml rename to sensio/framework-extra-bundle/3.0/config/packages/framework_extra.yaml diff --git a/sensio/framework-extra-bundle/3.0/manifest.json b/sensio/framework-extra-bundle/3.0/manifest.json index 4977c61a..dbf63474 100644 --- a/sensio/framework-extra-bundle/3.0/manifest.json +++ b/sensio/framework-extra-bundle/3.0/manifest.json @@ -3,6 +3,6 @@ "Sensio\\Bundle\\FrameworkExtraBundle\\SensioFrameworkExtraBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" } } diff --git a/sensiolabs/security-checker/4.0/etc/packages/dev/security-checker.yaml b/sensiolabs/security-checker/4.0/config/packages/dev/security-checker.yaml similarity index 100% rename from sensiolabs/security-checker/4.0/etc/packages/dev/security-checker.yaml rename to sensiolabs/security-checker/4.0/config/packages/dev/security-checker.yaml diff --git a/sensiolabs/security-checker/4.0/manifest.json b/sensiolabs/security-checker/4.0/manifest.json index 26033f4b..3a0ca581 100644 --- a/sensiolabs/security-checker/4.0/manifest.json +++ b/sensiolabs/security-checker/4.0/manifest.json @@ -1,6 +1,6 @@ { "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" }, "composer-scripts": { "security-checker security:check": "script" diff --git a/symfony/framework-bundle/3.3/Makefile b/symfony/framework-bundle/3.3/Makefile index cb20dea5..4a834c4b 100644 --- a/symfony/framework-bundle/3.3/Makefile +++ b/symfony/framework-bundle/3.3/Makefile @@ -21,7 +21,7 @@ serve_as_php: @printf "\033[32;49mServer listening on http://127.0.0.1:8000\033[39m\n"; @printf "Quit the server with CTRL-C.\n" @printf "Run \033[32mcomposer require symfony/web-server-bundle\033[39m for a better web server\n" - php -S 127.0.0.1:8000 -t web + php -S 127.0.0.1:8000 -t public serve: @${MAKE} serve_as_sf diff --git a/symfony/framework-bundle/3.3/etc/container.yaml b/symfony/framework-bundle/3.3/config/container.yaml similarity index 100% rename from symfony/framework-bundle/3.3/etc/container.yaml rename to symfony/framework-bundle/3.3/config/container.yaml diff --git a/symfony/framework-bundle/3.3/etc/packages/app.yaml b/symfony/framework-bundle/3.3/config/packages/app.yaml similarity index 100% rename from symfony/framework-bundle/3.3/etc/packages/app.yaml rename to symfony/framework-bundle/3.3/config/packages/app.yaml diff --git a/symfony/framework-bundle/3.3/etc/packages/framework.yaml b/symfony/framework-bundle/3.3/config/packages/framework.yaml similarity index 100% rename from symfony/framework-bundle/3.3/etc/packages/framework.yaml rename to symfony/framework-bundle/3.3/config/packages/framework.yaml diff --git a/symfony/framework-bundle/3.3/etc/packages/test/framework.yaml b/symfony/framework-bundle/3.3/config/packages/test/framework.yaml similarity index 100% rename from symfony/framework-bundle/3.3/etc/packages/test/framework.yaml rename to symfony/framework-bundle/3.3/config/packages/test/framework.yaml diff --git a/symfony/framework-bundle/3.3/manifest.json b/symfony/framework-bundle/3.3/manifest.json index 98e6ad18..4380edd7 100644 --- a/symfony/framework-bundle/3.3/manifest.json +++ b/symfony/framework-bundle/3.3/manifest.json @@ -3,13 +3,13 @@ "Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/", - "src/": "%SRC_DIR%/", - "web/": "%WEB_DIR%/" + "config/": "%CONFIG_DIR%/", + "public/": "%PUBLIC_DIR%/", + "src/": "%SRC_DIR%/" }, "composer-scripts": { "make cache-warmup": "script", - "assets:install --symlink --relative %WEB_DIR%": "symfony-cmd" + "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd" }, "env": { "APP_ENV": "dev", @@ -18,8 +18,8 @@ }, "gitignore": [ ".env", + "/public/bundles/", "/var/", - "/vendor/", - "/web/bundles/" + "/vendor/" ] } diff --git a/symfony/framework-bundle/3.3/src/Kernel.php b/symfony/framework-bundle/3.3/src/Kernel.php index da00a87e..1aa7fc4b 100644 --- a/symfony/framework-bundle/3.3/src/Kernel.php +++ b/symfony/framework-bundle/3.3/src/Kernel.php @@ -29,7 +29,7 @@ final class Kernel extends BaseKernel public function registerBundles(): iterable { - $contents = require dirname(__DIR__).'/etc/bundles.php'; + $contents = require dirname(__DIR__).'/config/bundles.php'; foreach ($contents as $class => $envs) { if (isset($envs['all']) || isset($envs[$this->environment])) { yield new $class(); @@ -39,7 +39,7 @@ final class Kernel extends BaseKernel protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void { - $confDir = dirname(__DIR__).'/etc'; + $confDir = dirname(__DIR__).'/config'; $loader->load($confDir.'/packages/*'.self::CONFIG_EXTS, 'glob'); if (is_dir($confDir.'/packages/'.$this->environment)) { $loader->load($confDir.'/packages/'.$this->environment.'/**/*'.self::CONFIG_EXTS, 'glob'); @@ -49,7 +49,7 @@ final class Kernel extends BaseKernel protected function configureRoutes(RouteCollectionBuilder $routes): void { - $confDir = dirname(__DIR__).'/etc'; + $confDir = dirname(__DIR__).'/config'; if (is_dir($confDir.'/routing/')) { $routes->import($confDir.'/routing/*'.self::CONFIG_EXTS, '/', 'glob'); } diff --git a/symfony/monolog-bundle/3.1/etc/packages/dev/monolog.php b/symfony/monolog-bundle/3.1/config/packages/dev/monolog.php similarity index 100% rename from symfony/monolog-bundle/3.1/etc/packages/dev/monolog.php rename to symfony/monolog-bundle/3.1/config/packages/dev/monolog.php diff --git a/symfony/monolog-bundle/3.1/etc/packages/prod/monolog.php b/symfony/monolog-bundle/3.1/config/packages/prod/monolog.php similarity index 100% rename from symfony/monolog-bundle/3.1/etc/packages/prod/monolog.php rename to symfony/monolog-bundle/3.1/config/packages/prod/monolog.php diff --git a/symfony/monolog-bundle/3.1/manifest.json b/symfony/monolog-bundle/3.1/manifest.json index 22c89876..1dc6c694 100644 --- a/symfony/monolog-bundle/3.1/manifest.json +++ b/symfony/monolog-bundle/3.1/manifest.json @@ -3,7 +3,7 @@ "Symfony\\Bundle\\MonologBundle\\MonologBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" }, "aliases": ["log", "logger", "logging", "logs", "monolog"] } diff --git a/symfony/requirements-checker/1.0/manifest.json b/symfony/requirements-checker/1.0/manifest.json index 46e142d9..10932ae4 100644 --- a/symfony/requirements-checker/1.0/manifest.json +++ b/symfony/requirements-checker/1.0/manifest.json @@ -1,7 +1,7 @@ { "copy-from-package": { "bin/check.php": "%BIN_DIR%/check.php", - "web/check.php": "%WEB_DIR%/check.php" + "public/check.php": "%PUBLIC_DIR%/check.php" }, "composer-scripts": { "%BIN_DIR%/check.php": "php-script" diff --git a/symfony/routing/3.3/etc/packages/dev/routing.yaml b/symfony/routing/3.3/config/packages/dev/routing.yaml similarity index 100% rename from symfony/routing/3.3/etc/packages/dev/routing.yaml rename to symfony/routing/3.3/config/packages/dev/routing.yaml diff --git a/symfony/routing/3.3/etc/packages/routing.yaml b/symfony/routing/3.3/config/packages/routing.yaml similarity index 100% rename from symfony/routing/3.3/etc/packages/routing.yaml rename to symfony/routing/3.3/config/packages/routing.yaml diff --git a/symfony/routing/3.3/etc/routing.yaml b/symfony/routing/3.3/config/routing.yaml similarity index 100% rename from symfony/routing/3.3/etc/routing.yaml rename to symfony/routing/3.3/config/routing.yaml diff --git a/symfony/routing/3.3/manifest.json b/symfony/routing/3.3/manifest.json index 5037f100..c0c66b64 100644 --- a/symfony/routing/3.3/manifest.json +++ b/symfony/routing/3.3/manifest.json @@ -1,6 +1,6 @@ { "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" }, "aliases": ["router"] } diff --git a/symfony/security-bundle/3.3/etc/packages/security.yaml b/symfony/security-bundle/3.3/config/packages/security.yaml similarity index 100% rename from symfony/security-bundle/3.3/etc/packages/security.yaml rename to symfony/security-bundle/3.3/config/packages/security.yaml diff --git a/symfony/security-bundle/3.3/manifest.json b/symfony/security-bundle/3.3/manifest.json index e72dcc79..5d8527e4 100644 --- a/symfony/security-bundle/3.3/manifest.json +++ b/symfony/security-bundle/3.3/manifest.json @@ -3,7 +3,7 @@ "Symfony\\Bundle\\SecurityBundle\\SecurityBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" }, "aliases": ["security"] } diff --git a/symfony/swiftmailer-bundle/2.5/etc/packages/dev/swiftmailer.yaml b/symfony/swiftmailer-bundle/2.5/config/packages/dev/swiftmailer.yaml similarity index 100% rename from symfony/swiftmailer-bundle/2.5/etc/packages/dev/swiftmailer.yaml rename to symfony/swiftmailer-bundle/2.5/config/packages/dev/swiftmailer.yaml diff --git a/symfony/swiftmailer-bundle/2.5/etc/packages/swiftmailer.yaml b/symfony/swiftmailer-bundle/2.5/config/packages/swiftmailer.yaml similarity index 100% rename from symfony/swiftmailer-bundle/2.5/etc/packages/swiftmailer.yaml rename to symfony/swiftmailer-bundle/2.5/config/packages/swiftmailer.yaml diff --git a/symfony/swiftmailer-bundle/2.5/etc/packages/test/swiftmailer.yaml b/symfony/swiftmailer-bundle/2.5/config/packages/test/swiftmailer.yaml similarity index 100% rename from symfony/swiftmailer-bundle/2.5/etc/packages/test/swiftmailer.yaml rename to symfony/swiftmailer-bundle/2.5/config/packages/test/swiftmailer.yaml diff --git a/symfony/swiftmailer-bundle/2.5/manifest.json b/symfony/swiftmailer-bundle/2.5/manifest.json index 3a449ef6..994203a2 100644 --- a/symfony/swiftmailer-bundle/2.5/manifest.json +++ b/symfony/swiftmailer-bundle/2.5/manifest.json @@ -3,7 +3,7 @@ "Symfony\\Bundle\\SwiftmailerBundle\\SwiftmailerBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" }, "env": { "#1": "For Gmail as a transport, use: \"gmail://username:password@localhost\"", diff --git a/symfony/translation/3.3/etc/packages/translation.yaml b/symfony/translation/3.3/config/packages/translation.yaml similarity index 100% rename from symfony/translation/3.3/etc/packages/translation.yaml rename to symfony/translation/3.3/config/packages/translation.yaml diff --git a/symfony/translation/3.3/manifest.json b/symfony/translation/3.3/manifest.json index ce6e40b5..80694773 100644 --- a/symfony/translation/3.3/manifest.json +++ b/symfony/translation/3.3/manifest.json @@ -1,6 +1,6 @@ { "copy-from-recipe": { - "etc/": "%ETC_DIR%/", + "config/": "%CONFIG_DIR%/", "translations/": "translations/" }, "container": { diff --git a/symfony/twig-bundle/3.3/etc/packages/twig.yaml b/symfony/twig-bundle/3.3/config/packages/twig.yaml similarity index 100% rename from symfony/twig-bundle/3.3/etc/packages/twig.yaml rename to symfony/twig-bundle/3.3/config/packages/twig.yaml diff --git a/symfony/twig-bundle/3.3/etc/routing/dev/twig.yaml b/symfony/twig-bundle/3.3/config/routing/dev/twig.yaml similarity index 100% rename from symfony/twig-bundle/3.3/etc/routing/dev/twig.yaml rename to symfony/twig-bundle/3.3/config/routing/dev/twig.yaml diff --git a/symfony/twig-bundle/3.3/manifest.json b/symfony/twig-bundle/3.3/manifest.json index 6c677a90..ee5e13b6 100644 --- a/symfony/twig-bundle/3.3/manifest.json +++ b/symfony/twig-bundle/3.3/manifest.json @@ -3,7 +3,7 @@ "Symfony\\Bundle\\TwigBundle\\TwigBundle": ["all"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/", + "config/": "%CONFIG_DIR%/", "templates/": "templates/" }, "aliases": ["twig", "template", "templates", "templating"] diff --git a/symfony/web-profiler-bundle/3.3/etc/packages/dev/web_profiler.yaml b/symfony/web-profiler-bundle/3.3/config/packages/dev/web_profiler.yaml similarity index 100% rename from symfony/web-profiler-bundle/3.3/etc/packages/dev/web_profiler.yaml rename to symfony/web-profiler-bundle/3.3/config/packages/dev/web_profiler.yaml diff --git a/symfony/web-profiler-bundle/3.3/etc/packages/test/web_profiler.yaml b/symfony/web-profiler-bundle/3.3/config/packages/test/web_profiler.yaml similarity index 100% rename from symfony/web-profiler-bundle/3.3/etc/packages/test/web_profiler.yaml rename to symfony/web-profiler-bundle/3.3/config/packages/test/web_profiler.yaml diff --git a/symfony/web-profiler-bundle/3.3/etc/routing/dev/web_profiler.yaml b/symfony/web-profiler-bundle/3.3/config/routing/dev/web_profiler.yaml similarity index 100% rename from symfony/web-profiler-bundle/3.3/etc/routing/dev/web_profiler.yaml rename to symfony/web-profiler-bundle/3.3/config/routing/dev/web_profiler.yaml diff --git a/symfony/web-profiler-bundle/3.3/manifest.json b/symfony/web-profiler-bundle/3.3/manifest.json index 07279611..cb84a249 100644 --- a/symfony/web-profiler-bundle/3.3/manifest.json +++ b/symfony/web-profiler-bundle/3.3/manifest.json @@ -3,6 +3,6 @@ "Symfony\\Bundle\\WebProfilerBundle\\WebProfilerBundle": ["dev", "test"] }, "copy-from-recipe": { - "etc/": "%ETC_DIR%/" + "config/": "%CONFIG_DIR%/" } } From 0cf07ad927d1931fa64dcaf88c3adce6134e8f17 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 3 Jul 2017 15:37:49 +0300 Subject: [PATCH 2/2] fixed some file names --- .../packages/dev/{easy-log-handler.yaml => easy_log_handler.yaml} | 0 .../packages/dev/{security-checker.yaml => security_checker.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename easycorp/easy-log-handler/1.0/config/packages/dev/{easy-log-handler.yaml => easy_log_handler.yaml} (100%) rename sensiolabs/security-checker/4.0/config/packages/dev/{security-checker.yaml => security_checker.yaml} (100%) diff --git a/easycorp/easy-log-handler/1.0/config/packages/dev/easy-log-handler.yaml b/easycorp/easy-log-handler/1.0/config/packages/dev/easy_log_handler.yaml similarity index 100% rename from easycorp/easy-log-handler/1.0/config/packages/dev/easy-log-handler.yaml rename to easycorp/easy-log-handler/1.0/config/packages/dev/easy_log_handler.yaml diff --git a/sensiolabs/security-checker/4.0/config/packages/dev/security-checker.yaml b/sensiolabs/security-checker/4.0/config/packages/dev/security_checker.yaml similarity index 100% rename from sensiolabs/security-checker/4.0/config/packages/dev/security-checker.yaml rename to sensiolabs/security-checker/4.0/config/packages/dev/security_checker.yaml