feature #106 Move etc/ to config/ and web/ to public/ (fabpot)

This PR was squashed before being merged into the master branch (closes #106).

Discussion
----------

Move etc/ to config/ and web/ to public/

| Q             | A
| ------------- | ---
| License       | MIT

Must be merged just after symfony/flex#122

Commits
-------

0cf07ad fixed some file names
bf2148f moved etc/ to config/ and web/ to public/

Author: fabpot

README.rst

@@ -3,7 +3,7 @@
         "ApiPlatform\\Core\\Bridge\\Symfony\\Bundle\\ApiPlatformBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
+        "config/": "%CONFIG_DIR%/",
         "src/": "%SRC_DIR%/"
     }
 }

api-platform/core/2.1/etc/packages/api_platform.yaml renamed to api-platform/core/2.1/config/packages/api_platform.yaml

@@ -3,7 +3,7 @@
         "Doctrine\\Bundle\\DoctrineBundle\\DoctrineBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
+        "config/": "%CONFIG_DIR%/",
         "src/": "%SRC_DIR%/"
     },
     "env": {

api-platform/core/2.1/etc/routing/api_platform.yaml renamed to api-platform/core/2.1/config/routing/api_platform.yaml

@@ -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"]

api-platform/core/2.1/manifest.json

@@ -1,5 +1,5 @@
 {
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     }
 }

doctrine/doctrine-bundle/1.6/etc/packages/doctrine.yaml renamed to doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml

@@ -3,7 +3,7 @@
         "JavierEguiluz\\Bundle\\EasyAdminBundle\\EasyAdminBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     },
     "aliases": ["admin-gen", "admin-generator", "admin"]
 }

doctrine/doctrine-bundle/1.6/etc/packages/prod/doctrine.yaml renamed to doctrine/doctrine-bundle/1.6/config/packages/prod/doctrine.yaml

@@ -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"

doctrine/doctrine-bundle/1.6/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)%"
     }
 }

doctrine/doctrine-migrations-bundle/1.2/etc/packages/doctrine_migrations.yaml renamed to doctrine/doctrine-migrations-bundle/1.2/config/packages/doctrine_migrations.yaml

@@ -3,6 +3,6 @@
         "Sensio\\Bundle\\FrameworkExtraBundle\\SensioFrameworkExtraBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     }
 }

doctrine/doctrine-migrations-bundle/1.2/manifest.json

@@ -1,6 +1,6 @@
 {
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     },
     "composer-scripts": {
         "security-checker security:check": "script"

easycorp/easy-log-handler/1.0/etc/packages/dev/easy-log-handler.yaml renamed to easycorp/easy-log-handler/1.0/config/packages/dev/easy_log_handler.yaml

@@ -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

easycorp/easy-log-handler/1.0/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/"
     ]
 }

javiereguiluz/easyadmin-bundle/1.16/etc/packages/easy_admin.yaml renamed to javiereguiluz/easyadmin-bundle/1.16/config/packages/easy_admin.yaml

@@ -29,7 +29,7 @@ public function getLogDir(): string
 
     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 @@ public function registerBundles(): iterable
 
     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 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
 
     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');
         }

javiereguiluz/easyadmin-bundle/1.16/etc/routing/easy_admin.yaml renamed to javiereguiluz/easyadmin-bundle/1.16/config/routing/easy_admin.yaml

@@ -3,7 +3,7 @@
         "Symfony\\Bundle\\MonologBundle\\MonologBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     },
     "aliases": ["log", "logger", "logging", "logs", "monolog"]
 }

javiereguiluz/easyadmin-bundle/1.16/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"

lexik/jwt-authentication-bundle/2.3/Makefile

@@ -1,6 +1,6 @@
 {
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     },
     "aliases": ["router"]
 }

lexik/jwt-authentication-bundle/2.3/etc/packages/lexik_jwt_authentication.yaml renamed to lexik/jwt-authentication-bundle/2.3/config/packages/lexik_jwt_authentication.yaml

@@ -3,7 +3,7 @@
         "Symfony\\Bundle\\SecurityBundle\\SecurityBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     },
     "aliases": ["security"]
 }

lexik/jwt-authentication-bundle/2.3/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\"",

sensio/framework-extra-bundle/3.0/etc/packages/framework_extra.yaml renamed to sensio/framework-extra-bundle/3.0/config/packages/framework_extra.yaml

@@ -1,6 +1,6 @@
 {
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
+        "config/": "%CONFIG_DIR%/",
         "translations/": "translations/"
     },
     "container": {

sensio/framework-extra-bundle/3.0/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"]

sensiolabs/security-checker/4.0/etc/packages/dev/security-checker.yaml renamed to sensiolabs/security-checker/4.0/config/packages/dev/security_checker.yaml

@@ -3,6 +3,6 @@
         "Symfony\\Bundle\\WebProfilerBundle\\WebProfilerBundle": ["dev", "test"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     }
 }