bug #8788 Remove some wrong uses of the app/ dir (javiereguiluz)

weaverryan · weaverryan · commit d2f0955f8569 · 2017-11-30T15:36:39.000-05:00
This PR was merged into the 4.0 branch. Discussion ---------- Remove some wrong uses of the app/ dir Commits ------- b2426d4 Remove some wrong uses of the app/ dir
diff --git a/_includes/service_container/_my_mailer.rst.inc b/_includes/service_container/_my_mailer.rst.inc
@@ -10,7 +10,7 @@
 
     .. code-block:: xml
 
-        <!-- app/config/services.xml -->
+        <!-- config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst
@@ -132,7 +132,7 @@ Files and Directories
 ---------------------
 
 * When referencing directories, always add a trailing slash to avoid confusions
-  with regular files (e.g. "execute the ``console`` script located at the ``app/``
+  with regular files (e.g. "execute the ``console`` script located at the ``bin/``
   directory").
 * When referencing file extensions explicitly, you should include a leading dot
   for every extension (e.g. "XML files use the ``.xml`` extension").
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
@@ -386,7 +386,7 @@ Now, register this class as a Doctrine listener:
 
     .. code-block:: xml
 
-        <!-- app/config/config.xml -->
+        <!-- config/services.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -257,7 +257,7 @@ great, your user can't actually add any new tags yet.
     rendering the form in the template if you render the whole form at
     once (e.g ``form_widget(form)``). To fix this you can set this directive
     to a higher value (either via a ``php.ini`` file or via :phpfunction:`ini_set`,
-    for example in ``app/autoload.php``) or render each form field by hand
+    for example in ``public/index.php``) or render each form field by hand
     using ``form_row()``.
 
 .. _form-collections-new-prototype:
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -305,7 +305,7 @@ The following block shows all possible configuration keys:
                 # the DBAL driverOptions option
                 options:
                     foo: bar
-                path:                 '%kernel.project_dir%/app/data/data.sqlite'
+                path:                 '%kernel.project_dir%/var/data/data.sqlite'
                 memory:               true
                 unix_socket:          /tmp/mysql.sock
                 # the DBAL wrapperClass option
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -540,7 +540,7 @@ Using the BCrypt Password Encoder
 
     .. code-block:: xml
 
-        <!-- app/config/security.xml -->
+        <!-- config/packages/security.xml -->
         <?xml version="1.0" charset="UTF-8" ?>
         <srv:container xmlns="http://symfony.com/schema/dic/security"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -870,8 +870,7 @@ The ``alias`` option is required and very important: it defines the file
 "suffix" that will be used for the resource files that use this loader.
 For example, suppose you have some custom ``bin`` format that you need to
 load. If you have a ``bin`` file that contains French translations for
-the ``messages`` domain, then you might have a file
-``app/Resources/translations/messages.fr.bin``.
+the ``messages`` domain, then you might have a file ``translations/messages.fr.bin``.
 
 When Symfony tries to load the ``bin`` file, it passes the path to your
 custom loader as the ``$resource`` argument. You can then perform any logic
diff --git a/security/access_control.rst b/security/access_control.rst
@@ -63,7 +63,7 @@ Take the following ``access_control`` entries as an example:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
             'access_control' => array(
@@ -202,7 +202,7 @@ pattern so that it is only accessible by requests from the local server itself:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
             'access_control' => array(
@@ -324,7 +324,7 @@ the user will be redirected to ``https``:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             'access_control' => array(
                 array(
diff --git a/security/access_denied_handler.rst b/security/access_denied_handler.rst
@@ -57,7 +57,7 @@ configure it under your firewall:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         use App\Security\AccessDeniedHandler;
 
         $container->loadFromExtension('security', array(
diff --git a/security/api_key_authentication.rst b/security/api_key_authentication.rst
@@ -334,7 +334,7 @@ and ``provider`` keys:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ...
         use App\Security\ApiKeyAuthenticator;
@@ -387,7 +387,7 @@ If you have defined ``access_control``, make sure to add a new entry:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             'access_control' => array(
                 array(
@@ -455,7 +455,7 @@ configuration or set it to ``false``:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ..
         $container->loadFromExtension('security', array(
diff --git a/security/csrf_in_login_form.rst b/security/csrf_in_login_form.rst
@@ -92,7 +92,7 @@ use the default provider available in the security component:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
@@ -207,7 +207,7 @@ After this, you have protected your login form against CSRF attacks.
 
         .. code-block:: php
 
-            // app/config/security.php
+            // config/packages/security.php
             $container->loadFromExtension('security', array(
                 // ...
 
diff --git a/security/custom_password_authenticator.rst b/security/custom_password_authenticator.rst
@@ -192,7 +192,7 @@ using the ``simple_form`` key:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ...
         use App\Security\TimeAuthenticator;
diff --git a/security/custom_provider.rst b/security/custom_provider.rst
@@ -212,7 +212,7 @@ to the list of providers in the "security" config. Choose a name for the user pr
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         use App\Security\User\WebserviceUserProvider;
 
         $container->loadFromExtension('security', array(
@@ -260,7 +260,7 @@ users, e.g. by filling in a login form. You can do this by adding a line to the
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         use App\Security\User\WebserviceUser;
 
         $container->loadFromExtension('security', array(
@@ -331,7 +331,7 @@ is compared to the hashed password returned by your ``getPassword()`` method.
 
         .. code-block:: php
 
-            // app/config/security.php
+            // config/packages/security.php
             use App\Security\User\WebserviceUser;
 
             $container->loadFromExtension('security', array(
diff --git a/security/firewall_restriction.rst b/security/firewall_restriction.rst
@@ -52,7 +52,7 @@ matches the configured ``pattern``.
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ...
         $container->loadFromExtension('security', array(
@@ -109,7 +109,7 @@ only initialize if the host from the request matches against the configuration.
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ...
         $container->loadFromExtension('security', array(
@@ -167,7 +167,7 @@ the provided HTTP methods.
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ...
         $container->loadFromExtension('security', array(
diff --git a/security/force_https.rst b/security/force_https.rst
@@ -39,7 +39,7 @@ to use HTTPS then you could use the following configuration:
 
         .. code-block:: php
 
-            // app/config/security.php
+            // config/packages/security.php
             $container->loadFromExtension('security', array(
                 // ...
 
@@ -90,7 +90,7 @@ role:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
diff --git a/security/form_login.rst b/security/form_login.rst
@@ -73,7 +73,7 @@ a relative/absolute URL or a Symfony route name:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
@@ -131,7 +131,7 @@ previously requested URL and always redirect to the default page:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
@@ -231,7 +231,7 @@ parameter is included in the request, you may use the value of the
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
@@ -297,7 +297,7 @@ option to define a new target via a relative/absolute URL or a Symfony route nam
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
@@ -385,7 +385,7 @@ redirects can be customized using the  ``target_path_parameter`` and
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
diff --git a/security/form_login_setup.rst b/security/form_login_setup.rst
@@ -49,7 +49,7 @@ First, enable form login under your firewall:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array(
@@ -325,7 +325,7 @@ all URLs (including the ``/login`` URL), will cause a redirect loop:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ...
         'access_control' => array(
@@ -365,7 +365,7 @@ fixes the problem:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ...
         'access_control' => array(
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst
@@ -310,7 +310,7 @@ Finally, configure your ``firewalls`` key in ``security.yaml`` to use this authe
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
 
         // ..
         use App\Security\TokenAuthenticator;
diff --git a/security/impersonating_user.rst b/security/impersonating_user.rst
@@ -54,7 +54,7 @@ firewall listener:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
@@ -172,7 +172,7 @@ setting:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             // ...
 
diff --git a/security/json_login_setup.rst b/security/json_login_setup.rst
@@ -41,7 +41,7 @@ First, enable the JSON login under your firewall:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array(
@@ -185,7 +185,7 @@ The security configuration should be:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array(
diff --git a/security/ldap.rst b/security/ldap.rst
@@ -471,7 +471,7 @@ Configuration example for form login and query_string
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         use Symfony\Component\Ldap\Ldap;
 
         $container->loadFromExtension('security', array(
diff --git a/security/multiple_guard_authenticators.rst b/security/multiple_guard_authenticators.rst
@@ -58,7 +58,7 @@ This is how your security configuration can look in action:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         use App\Security\LoginFormAuthenticator;
         use App\Security\FacebookConnectAuthenticator;
 
@@ -143,7 +143,7 @@ the solution is to split the configuration into two separate firewalls:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         use App\Security\ApiTokenAuthenticator;
         use App\Security\LoginFormAuthenticator;
 
diff --git a/security/multiple_user_providers.rst b/security/multiple_user_providers.rst
@@ -55,7 +55,7 @@ creating a new provider that chains the two together:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         use App\Entity\User;
 
         $container->loadFromExtension('security', array(
@@ -125,7 +125,7 @@ to use a specific provider:
 
     .. code-block:: php
 
-        // app/config/security.php
+        // config/packages/security.php
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'secured_area' => array(
diff --git a/security/named_encoders.rst b/security/named_encoders.rst
diff --git a/security/pre_authenticated.rst b/security/pre_authenticated.rst
diff --git a/security/remember_me.rst b/security/remember_me.rst
diff --git a/security/user_checkers.rst b/security/user_checkers.rst
diff --git a/security/voters.rst b/security/voters.rst
diff --git a/setup/built_in_web_server.rst b/setup/built_in_web_server.rst
diff --git a/templating.rst b/templating.rst
