Skip to content

Commit b2426d4

Browse files
javiereguiluzjaviereguiluz
committed
Remove some wrong uses of the app/ dir
1 parent 1e3c570 commit b2426d4

31 files changed

+57
-58
lines changed

Diff for: ‎_includes/service_container/_my_mailer.rst.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
.. code-block:: xml
1212

13-
<!-- app/config/services.xml -->
13+
<!-- config/services.xml -->
1414
<?xml version="1.0" encoding="UTF-8" ?>
1515
<container xmlns="http://symfony.com/schema/dic/services"
1616
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Diff for: ‎contributing/documentation/standards.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Files and Directories
132132
---------------------
133133

134134
* When referencing directories, always add a trailing slash to avoid confusions
135-
with regular files (e.g. "execute the ``console`` script located at the ``app/``
135+
with regular files (e.g. "execute the ``console`` script located at the ``bin/``
136136
directory").
137137
* When referencing file extensions explicitly, you should include a leading dot
138138
for every extension (e.g. "XML files use the ``.xml`` extension").

Diff for: ‎controller/upload_file.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ Now, register this class as a Doctrine listener:
386386
387387
.. code-block:: xml
388388
389-
<!-- app/config/config.xml -->
389+
<!-- config/services.xml -->
390390
<?xml version="1.0" encoding="UTF-8" ?>
391391
<container xmlns="http://symfony.com/schema/dic/services"
392392
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Diff for: ‎deployment.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ If your deployment method doesn't use Composer, you may have removed the
225225
The solution is to override the ``getProjectDir()`` method in the application
226226
kernel and return your project's root directory::
227227

228-
// app/AppKernel.php
228+
// src/Kernel.php
229229
// ...
230-
class AppKernel extends Kernel
230+
class Kernel extends BaseKernel
231231
{
232232
// ...
233233

Diff for: ‎form/form_collections.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ great, your user can't actually add any new tags yet.
257257
rendering the form in the template if you render the whole form at
258258
once (e.g ``form_widget(form)``). To fix this you can set this directive
259259
to a higher value (either via a ``php.ini`` file or via :phpfunction:`ini_set`,
260-
for example in ``app/autoload.php``) or render each form field by hand
260+
for example in ``public/index.php``) or render each form field by hand
261261
using ``form_row()``.
262262

263263
.. _form-collections-new-prototype:

Diff for: ‎reference/configuration/doctrine.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ The following block shows all possible configuration keys:
305305
# the DBAL driverOptions option
306306
options:
307307
foo: bar
308-
path: '%kernel.project_dir%/app/data/data.sqlite'
308+
path: '%kernel.project_dir%/var/data/data.sqlite'
309309
memory: true
310310
unix_socket: /tmp/mysql.sock
311311
# the DBAL wrapperClass option

Diff for: ‎reference/configuration/security.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ Using the BCrypt Password Encoder
540540
541541
.. code-block:: xml
542542
543-
<!-- app/config/security.xml -->
543+
<!-- config/packages/security.xml -->
544544
<?xml version="1.0" charset="UTF-8" ?>
545545
<srv:container xmlns="http://symfony.com/schema/dic/security"
546546
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Diff for: ‎reference/dic_tags.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,7 @@ The ``alias`` option is required and very important: it defines the file
870870
"suffix" that will be used for the resource files that use this loader.
871871
For example, suppose you have some custom ``bin`` format that you need to
872872
load. If you have a ``bin`` file that contains French translations for
873-
the ``messages`` domain, then you might have a file
874-
``app/Resources/translations/messages.fr.bin``.
873+
the ``messages`` domain, then you might have a file ``translations/messages.fr.bin``.
875874

876875
When Symfony tries to load the ``bin`` file, it passes the path to your
877876
custom loader as the ``$resource`` argument. You can then perform any logic

Diff for: ‎security/access_control.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Take the following ``access_control`` entries as an example:
6363
6464
.. code-block:: php
6565
66-
// app/config/security.php
66+
// config/packages/security.php
6767
$container->loadFromExtension('security', array(
6868
// ...
6969
'access_control' => array(
@@ -202,7 +202,7 @@ pattern so that it is only accessible by requests from the local server itself:
202202
203203
.. code-block:: php
204204
205-
// app/config/security.php
205+
// config/packages/security.php
206206
$container->loadFromExtension('security', array(
207207
// ...
208208
'access_control' => array(
@@ -324,7 +324,7 @@ the user will be redirected to ``https``:
324324
325325
.. code-block:: php
326326
327-
// app/config/security.php
327+
// config/packages/security.php
328328
$container->loadFromExtension('security', array(
329329
'access_control' => array(
330330
array(

Diff for: ‎security/access_denied_handler.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ configure it under your firewall:
5757
5858
.. code-block:: php
5959
60-
// app/config/security.php
60+
// config/packages/security.php
6161
use App\Security\AccessDeniedHandler;
6262
6363
$container->loadFromExtension('security', array(

Diff for: ‎security/api_key_authentication.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ and ``provider`` keys:
334334
335335
.. code-block:: php
336336
337-
// app/config/security.php
337+
// config/packages/security.php
338338
339339
// ...
340340
use App\Security\ApiKeyAuthenticator;
@@ -387,7 +387,7 @@ If you have defined ``access_control``, make sure to add a new entry:
387387
388388
.. code-block:: php
389389
390-
// app/config/security.php
390+
// config/packages/security.php
391391
$container->loadFromExtension('security', array(
392392
'access_control' => array(
393393
array(
@@ -455,7 +455,7 @@ configuration or set it to ``false``:
455455
456456
.. code-block:: php
457457
458-
// app/config/security.php
458+
// config/packages/security.php
459459
460460
// ..
461461
$container->loadFromExtension('security', array(

Diff for: ‎security/csrf_in_login_form.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ use the default provider available in the security component:
9292
9393
.. code-block:: php
9494
95-
// app/config/security.php
95+
// config/packages/security.php
9696
$container->loadFromExtension('security', array(
9797
// ...
9898
@@ -207,7 +207,7 @@ After this, you have protected your login form against CSRF attacks.
207207
208208
.. code-block:: php
209209
210-
// app/config/security.php
210+
// config/packages/security.php
211211
$container->loadFromExtension('security', array(
212212
// ...
213213

Diff for: ‎security/custom_password_authenticator.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ using the ``simple_form`` key:
192192
193193
.. code-block:: php
194194
195-
// app/config/security.php
195+
// config/packages/security.php
196196
197197
// ...
198198
use App\Security\TimeAuthenticator;

Diff for: ‎security/custom_provider.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ to the list of providers in the "security" config. Choose a name for the user pr
212212
213213
.. code-block:: php
214214
215-
// app/config/security.php
215+
// config/packages/security.php
216216
use App\Security\User\WebserviceUserProvider;
217217
218218
$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
260260
261261
.. code-block:: php
262262
263-
// app/config/security.php
263+
// config/packages/security.php
264264
use App\Security\User\WebserviceUser;
265265
266266
$container->loadFromExtension('security', array(
@@ -331,7 +331,7 @@ is compared to the hashed password returned by your ``getPassword()`` method.
331331
332332
.. code-block:: php
333333
334-
// app/config/security.php
334+
// config/packages/security.php
335335
use App\Security\User\WebserviceUser;
336336
337337
$container->loadFromExtension('security', array(

Diff for: ‎security/firewall_restriction.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ matches the configured ``pattern``.
5252
5353
.. code-block:: php
5454
55-
// app/config/security.php
55+
// config/packages/security.php
5656
5757
// ...
5858
$container->loadFromExtension('security', array(
@@ -109,7 +109,7 @@ only initialize if the host from the request matches against the configuration.
109109
110110
.. code-block:: php
111111
112-
// app/config/security.php
112+
// config/packages/security.php
113113
114114
// ...
115115
$container->loadFromExtension('security', array(
@@ -167,7 +167,7 @@ the provided HTTP methods.
167167
168168
.. code-block:: php
169169
170-
// app/config/security.php
170+
// config/packages/security.php
171171
172172
// ...
173173
$container->loadFromExtension('security', array(

Diff for: ‎security/force_https.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ to use HTTPS then you could use the following configuration:
3939
4040
.. code-block:: php
4141
42-
// app/config/security.php
42+
// config/packages/security.php
4343
$container->loadFromExtension('security', array(
4444
// ...
4545
@@ -90,7 +90,7 @@ role:
9090
9191
.. code-block:: php
9292
93-
// app/config/security.php
93+
// config/packages/security.php
9494
$container->loadFromExtension('security', array(
9595
// ...
9696

Diff for: ‎security/form_login.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ a relative/absolute URL or a Symfony route name:
7373
7474
.. code-block:: php
7575
76-
// app/config/security.php
76+
// config/packages/security.php
7777
$container->loadFromExtension('security', array(
7878
// ...
7979
@@ -131,7 +131,7 @@ previously requested URL and always redirect to the default page:
131131
132132
.. code-block:: php
133133
134-
// app/config/security.php
134+
// config/packages/security.php
135135
$container->loadFromExtension('security', array(
136136
// ...
137137
@@ -231,7 +231,7 @@ parameter is included in the request, you may use the value of the
231231
232232
.. code-block:: php
233233
234-
// app/config/security.php
234+
// config/packages/security.php
235235
$container->loadFromExtension('security', array(
236236
// ...
237237
@@ -297,7 +297,7 @@ option to define a new target via a relative/absolute URL or a Symfony route nam
297297
298298
.. code-block:: php
299299
300-
// app/config/security.php
300+
// config/packages/security.php
301301
$container->loadFromExtension('security', array(
302302
// ...
303303
@@ -385,7 +385,7 @@ redirects can be customized using the ``target_path_parameter`` and
385385
386386
.. code-block:: php
387387
388-
// app/config/security.php
388+
// config/packages/security.php
389389
$container->loadFromExtension('security', array(
390390
// ...
391391

Diff for: ‎security/form_login_setup.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ First, enable form login under your firewall:
4949
5050
.. code-block:: php
5151
52-
// app/config/security.php
52+
// config/packages/security.php
5353
$container->loadFromExtension('security', array(
5454
'firewalls' => array(
5555
'main' => array(
@@ -325,7 +325,7 @@ all URLs (including the ``/login`` URL), will cause a redirect loop:
325325
326326
.. code-block:: php
327327
328-
// app/config/security.php
328+
// config/packages/security.php
329329
330330
// ...
331331
'access_control' => array(
@@ -365,7 +365,7 @@ fixes the problem:
365365
366366
.. code-block:: php
367367
368-
// app/config/security.php
368+
// config/packages/security.php
369369
370370
// ...
371371
'access_control' => array(

Diff for: ‎security/guard_authentication.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ Finally, configure your ``firewalls`` key in ``security.yaml`` to use this authe
310310
311311
.. code-block:: php
312312
313-
// app/config/security.php
313+
// config/packages/security.php
314314
315315
// ..
316316
use App\Security\TokenAuthenticator;

Diff for: ‎security/impersonating_user.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ firewall listener:
5454
5555
.. code-block:: php
5656
57-
// app/config/security.php
57+
// config/packages/security.php
5858
$container->loadFromExtension('security', array(
5959
// ...
6060
@@ -172,7 +172,7 @@ setting:
172172
173173
.. code-block:: php
174174
175-
// app/config/security.php
175+
// config/packages/security.php
176176
$container->loadFromExtension('security', array(
177177
// ...
178178

Diff for: ‎security/json_login_setup.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ First, enable the JSON login under your firewall:
4141
4242
.. code-block:: php
4343
44-
// app/config/security.php
44+
// config/packages/security.php
4545
$container->loadFromExtension('security', array(
4646
'firewalls' => array(
4747
'main' => array(
@@ -185,7 +185,7 @@ The security configuration should be:
185185
186186
.. code-block:: php
187187
188-
// app/config/security.php
188+
// config/packages/security.php
189189
$container->loadFromExtension('security', array(
190190
'firewalls' => array(
191191
'main' => array(

Diff for: ‎security/ldap.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ Configuration example for form login and query_string
471471
472472
.. code-block:: php
473473
474-
// app/config/security.php
474+
// config/packages/security.php
475475
use Symfony\Component\Ldap\Ldap;
476476
477477
$container->loadFromExtension('security', array(

Diff for: ‎security/multiple_guard_authenticators.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ This is how your security configuration can look in action:
5858
5959
.. code-block:: php
6060
61-
// app/config/security.php
61+
// config/packages/security.php
6262
use App\Security\LoginFormAuthenticator;
6363
use App\Security\FacebookConnectAuthenticator;
6464
@@ -143,7 +143,7 @@ the solution is to split the configuration into two separate firewalls:
143143
144144
.. code-block:: php
145145
146-
// app/config/security.php
146+
// config/packages/security.php
147147
use App\Security\ApiTokenAuthenticator;
148148
use App\Security\LoginFormAuthenticator;
149149

Diff for: ‎security/multiple_user_providers.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ creating a new provider that chains the two together:
5555
5656
.. code-block:: php
5757
58-
// app/config/security.php
58+
// config/packages/security.php
5959
use App\Entity\User;
6060
6161
$container->loadFromExtension('security', array(
@@ -125,7 +125,7 @@ to use a specific provider:
125125
126126
.. code-block:: php
127127
128-
// app/config/security.php
128+
// config/packages/security.php
129129
$container->loadFromExtension('security', array(
130130
'firewalls' => array(
131131
'secured_area' => array(

0 commit comments

Comments
 (0)