Skip to content

Remove some wrong uses of the app/ dir #8788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2017
Merged

Remove some wrong uses of the app/ dir #8788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _includes/service_container/_my_mailer.rst.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contributing/documentation/standards.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").
Expand Down
2 changes: 1 addition & 1 deletion controller/upload_file.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions deployment.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ If your deployment method doesn't use Composer, you may have removed the
The solution is to override the ``getProjectDir()`` method in the application
kernel and return your project's root directory::

// app/AppKernel.php
// src/Kernel.php
// ...
class AppKernel extends Kernel
class Kernel extends BaseKernel
{
// ...

Expand Down
2 changes: 1 addition & 1 deletion form/form_collections.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion reference/configuration/doctrine.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion reference/configuration/security.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions reference/dic_tags.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions security/access_control.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion security/access_denied_handler.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions security/api_key_authentication.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ and ``provider`` keys:

.. code-block:: php

// app/config/security.php
// config/packages/security.php

// ...
use App\Security\ApiKeyAuthenticator;
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions security/csrf_in_login_form.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
// ...

Expand Down Expand Up @@ -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(
// ...

Expand Down
2 changes: 1 addition & 1 deletion security/custom_password_authenticator.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ using the ``simple_form`` key:

.. code-block:: php

// app/config/security.php
// config/packages/security.php

// ...
use App\Security\TimeAuthenticator;
Expand Down
6 changes: 3 additions & 3 deletions security/custom_provider.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions security/firewall_restriction.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ matches the configured ``pattern``.

.. code-block:: php

// app/config/security.php
// config/packages/security.php

// ...
$container->loadFromExtension('security', array(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -167,7 +167,7 @@ the provided HTTP methods.

.. code-block:: php

// app/config/security.php
// config/packages/security.php

// ...
$container->loadFromExtension('security', array(
Expand Down
4 changes: 2 additions & 2 deletions security/force_https.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
// ...

Expand Down Expand Up @@ -90,7 +90,7 @@ role:

.. code-block:: php

// app/config/security.php
// config/packages/security.php
$container->loadFromExtension('security', array(
// ...

Expand Down
10 changes: 5 additions & 5 deletions security/form_login.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
// ...

Expand Down Expand Up @@ -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(
// ...

Expand Down Expand Up @@ -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(
// ...

Expand Down Expand Up @@ -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(
// ...

Expand Down Expand Up @@ -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(
// ...

Expand Down
6 changes: 3 additions & 3 deletions security/form_login_setup.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -365,7 +365,7 @@ fixes the problem:

.. code-block:: php

// app/config/security.php
// config/packages/security.php

// ...
'access_control' => array(
Expand Down
2 changes: 1 addition & 1 deletion security/guard_authentication.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions security/impersonating_user.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ firewall listener:

.. code-block:: php

// app/config/security.php
// config/packages/security.php
$container->loadFromExtension('security', array(
// ...

Expand Down Expand Up @@ -172,7 +172,7 @@ setting:

.. code-block:: php

// app/config/security.php
// config/packages/security.php
$container->loadFromExtension('security', array(
// ...

Expand Down
4 changes: 2 additions & 2 deletions security/json_login_setup.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion security/ldap.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions security/multiple_guard_authenticators.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions security/multiple_user_providers.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
Loading