8000 Merge branch '4.0' · symfony/symfony-docs@196aad5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 196aad5

Browse files
weaverryanweaverryan
committed
Merge branch '4.0'
* 4.0: (44 commits) upgrading the upgrade docs Removed some mentions to deprecated features Remove references to AppKernel Removed references to the web/ directory Remove some wrong uses of the app/ dir Remove references to "standard edition" or "distributions" Fixed some *.yml file extensions Remove git project setup Updating the content of service_container Update validation path bad syntax updating most of the quick tour removing bad link removing a now-tiny article about git setup yaml removing diff - does not work with config block removing a tiny chapter Removed Assetic DIC tags Minor changes Fixed non-existent reference ...
2 parents a94ca8b + 80aceb0 commit 196aad5

File tree

214 files changed

+1187
-3875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+1187
-3875
lines changed

‎_build/redirection_map

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,8 @@
122122
/cookbook/console/logging /console/logging
123123
/cookbook/console/request_context /console/request_context
124124
/cookbook/console/style /console/style
125-
/cookbook/console/usage /console/usage
125+
/cookbook/console/usage /console
126+
/console/usage /console
126127
/cookbook/controller/csrf_token_validation /controller/csrf_token_validation
127128
/cookbook/controller/error_pages /controller/error_pages
128129
/cookbook/controller/forwarding /controller/forwarding
@@ -153,10 +154,10 @@
153154
/cookbook/doctrine/reverse_engineering /doctrine/reverse_engineering
154155
/doctrine/repository /doctrine
155156
/doctrine/console /doctrine
156-
/cookbook/email/cloud /email/cloud
157+
/cookbook/email/cloud /email
157158
/cookbook/email/dev_environment /email/dev_environment
158159
/cookbook/email/email /email
159-
/cookbook/email/gmail /email/gmail
160+
/cookbook/email/gmail /email
160161
/cookbook/email/index /email
161162
/cookbook/email/spool /email/spool
162163
/cookbook/email/testing /email/testing
@@ -286,19 +287,28 @@
286287
/cookbook/web_services/php_soap_extension /controller/soap_web_service
287288
/cookbook/workflow/homestead /setup/homestead
288289
/cookbook/workflow/index /setup
289-
/cookbook/workflow/new_project_git /setup/new_project_git
290-
/cookbook/workflow/new_project_svn /setup/new_project_git
291-
/setup/new_project_svn /setup/new_project_git
290+
/cookbook/workflow/new_project_git /setup
291+
/cookbook/workflow/new_project_svn /setup
292+
/setup/new_project_git /setup
293+
/setup/new_project_svn /setup
292294
/components/asset/index /components/asset
293295
/components/asset/introduction /components/asset
294296
/components/browser_kit/index /components/browser_kit
295297
/components/browser_kit/introduction /components/browser_kit
296298
/components/class_loader/introduction /components/class_loader
297299
/components/class_loader/index /components/class_loader
300+
/components/class_loader/cache_class_loader /components/class_loader
301+
/components/class_loader/class_loader /components/class_loader
302+
/components/class_loader/class_map_generator /components/class_loader
303+
/components/class_loader/debug_class_loader /components/class_loader
304+
/components/class_loader/map_class_loader /components/class_loader
305+
/components/class_loader/map_class_loader /components/class_loader
306+
/components/class_loader/psr4_class_loader /components/class_loader
298307
/components/config/introduction /components/config
299308
/components/config/index /components/config
300309
/components/console/helpers/tablehelper /components/console/helpers/table
301310
/components/console/helpers/progresshelper /components/console/helpers/progressbar
311+
/components/console/helpers/dialoghelper /components/console/helpers/questionhelper
302312
/components/console/introduction /components/console
303313
/components/console/index /components/console
304314
/components/debug/class_loader /components/debug
@@ -350,11 +360,21 @@
350360
/components/var_dumper/index /components/var_dumper
351361
/components/yaml/introduction /components/yaml
352362
/components/yaml/index /components/yaml
363+
/console/logging /console
353364
/deployment/tools /deployment
354365
/install/bundles /setup/bundles
366+
/email/gmail /email
367+
/email/cloud /email
355368
/event_dispatcher/class_extension /event_dispatcher
356369
/form /forms
357370
/form/use_virtual_forms /form/inherit_data_option
371+
/frontend/assetic/apply_to_option /frontend/assetic
372+
/frontend/assetic/asset_management /frontend/assetic
373+
/frontend/assetic/jpeg_optimize /frontend/assetic
374+
/frontend/assetic/php /frontend/assetic
375+
/frontend/assetic/uglifyjs /frontend/assetic
376+
/frontend/assetic/yuicompressor /frontend/assetic
377+
/reference/configuration/assetic /frontend/assetic
358378
/security/target_path /security
359379
/service_container/third_party /service_container
360380
/templating/templating_service /templates

‎_images/translation/debug_1.png

-22.2 KB
Binary file not shown.

‎_images/translation/debug_2.png

-22 KB
Binary file not shown.

‎_images/translation/debug_3.png

-21.9 KB
Binary file not shown.

‎_images/translation/debug_4.png

-21.7 KB
Binary file not shown.

‎_includes/service_container/_my_mailer.rst.inc

Lines changed: 1 addition & 1 deletion
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"

‎assetic/_standard_edition_warning.rst.inc

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎best_practices/web-assets.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ features.
2929

3030
Next: :doc:`/best_practices/tests`
3131

32-
.. _`official Assetic documentation`: https://github.com/kriswallsmith/assetic
3332
.. _`Webpack Encore`: https://github.com/symfony/webpack-encore
3433
.. _`Webpack`: https://webpack.js.org/
3534
.. _`official Webpack Encore documentation`: https://symfony.com/doc/current/frontend.html

‎bundles/best_practices.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -363,13 +363,13 @@ The end user can provide values in any configuration file:
363363

364364
.. code-block:: yaml
365365
366-
# app/config/config.yml
366+
# config/services.yaml
367367
parameters:
368368
acme_blog.author.email: 'fabien@example.com'
369369
370370
.. code-block:: xml
371371
372-
<!-- app/config/config.xml -->
372+
<!-- config/services.xml -->
373373
<?xml version="1.0" encoding="UTF-8" ?>
374374
<container xmlns="http://symfony.com/schema/dic/services"
375375
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -384,7 +384,7 @@ The end user can provide values in any configuration file:
384384
385385
.. code-block:: php
386386
387-
// app/config/config.php
387+
// config/services.php
388388
$container->setParameter('acme_blog.author.email', 'fabien@example.com');
389389
390390
Retrieve the configuration parameters in your code from the container::

‎bundles/override.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Routing
2626

2727
Routing is never automatically imported in Symfony. If you want to include
2828
the routes from any bundle, then they must be manually imported from somewhere
29-
in your application (e.g. ``config/routes.yml``).
29+
in your application (e.g. ``config/routes.yaml``).
3030

3131
The easiest way to "override" a bundle's routing is to never import it at
3232
all. Instead of importing a third-party bundle's routing, simply copy
@@ -101,7 +101,7 @@ to a new validation group:
101101

102102
.. code-block:: yaml
103103
104-
# src/Acme/UserBundle/Resources/config/validation.yml
104+
# src/Acme/UserBundle/Resources/config/validation.yaml
105105
FOS\UserBundle\Model\User:
106106
properties:
107107
plainPassword:

‎bundles/prepend_extension.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ users to choose to remove functionality they are not using. Creating multiple
1212
bundles has the drawback that configuration becomes more tedious and settings
1313
often need to be repeated for various bundles.
1414

15-
It is possible to remove the disadvantage of the multiple bundle approach
16-
by enabling a single Extension to prepend the settings for any bundle.
17-
It can use the settings defined in the ``app/config/config.yml``
18-
to prepend settings just as if they had been written explicitly by
19-
the user in the application configuration.
15+
It is possible to remove the disadvantage of the multiple bundle approach by
16+
enabling a single Extension to prepend the settings for any bundle. It can use
17+
the settings defined in the ``config/*`` files to prepend settings just as if
18+
they had been written explicitly by the user in the application configuration.
2019

2120
For example, this could be used to configure the entity manager name to use in
2221
multiple bundles. Or it can be used to enable an optional feature that depends
@@ -50,7 +49,7 @@ prepend settings to a bundle extension developers can use the
5049
:method:`Symfony\\Component\\DependencyInjection\\ContainerBuilder::prependExtensionConfig`
5150
method on the :class:`Symfony\\Component\\DependencyInjection\\ContainerBuilder`
5251
instance. As this method only prepends settings, any other settings done explicitly
53-
inside the ``app/config/config.yml`` would override these prepended settings.
52+
inside the ``config/*`` files would override these prepended settings.
5453

5554
The following example illustrates how to prepend
5655
a configuration setting in multiple bundles as well as disable a flag in multiple bundles
@@ -73,7 +72,7 @@ in case a specific other bundle is not registered::
7372
// acme_something and acme_other
7473
//
7574
// note that if the user manually configured
76-
// use_acme_goodbye to true in app/config/config.yml
75+
// use_acme_goodbye to true in config/services.yaml
7776
// then the setting would in the end be true and not false
7877
$container->prependExtensionConfig($name, $config);
7978
break;
@@ -96,14 +95,15 @@ in case a specific other bundle is not registered::
9695
}
9796

9897
The above would be the equivalent of writing the following into the
99-
``app/config/config.yml`` in case AcmeGoodbyeBundle is not registered and the
100-
``entity_manager_name`` setting for ``acme_hello`` is set to ``non_default``:
98+
``config/packages/acme_something.yaml`` in case AcmeGoodbyeBundle is not
99+
registered and the ``entity_manager_name`` setting for ``acme_hello`` is set to
100+
``non_default``:
101101

102102
.. configuration-block::
103103

104104
.. code-block:: yaml
105105
106-
# app/config/config.yml
106+
# config/packages/acme_something.yaml
107107
acme_something:
108108
# ...
109109
use_acme_goodbye: false
@@ -115,7 +115,7 @@ The above would be the equivalent of writing the following into the
115115
116116
.. code-block:: xml
117117
118-
<!-- app/config/config.xml -->
118+
<!-- config/packages/acme_something.xml -->
119119
<?xml version="1.0" encoding="UTF-8" ?>
120120
<container xmlns="http://symfony.com/schema/dic/services"
121121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -134,7 +134,7 @@ The above would be the equivalent of writing the following into the
134134
135135
.. code-block:: php
136136
137-
// app/config/config.php
137+
// config/packages/acme_something.php
138138
$container->loadFromExtension('acme_something', array(
139139
// ...
140140
'use_acm 10000 e_goodbye' => false,

‎components/cache/cache_pools.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,4 @@ when all items are successfully deleted)::
137137
# clears the "cache.validation" and "cache.app" pool
138138
$ php bin/console cache:pool:clear cache.validation cache.app
139139
140-
.. versionadded:: 3.4
141-
Starting from Symfony 3.4, the ``cache:clear`` command no longer clears
142-
the cache pools, so you must use the ``cache:pool:clear`` command to
143-
delete them.
144-
145140
.. _`Doctrine Cache`: https://github.com/doctrine/cache

‎components/class_loader.rst

Lines changed: 2 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -4,72 +4,9 @@
44
The ClassLoader Component
55
=========================
66

7-
The ClassLoader component provides tools to autoload your classes and
8-
cache their locations for performance.
9-
107
.. caution::
118

12-
The ClassLoader component was deprecated in Symfony 3.3 and it will be
13-
removed in 4.0. As an alternative, use any of the `class loading optimizations`_
14-
provided by Composer.
15-
16-
Usage
17-
-----
18-
19-
Whenever you reference a class that has not been required or included yet,
20-
PHP uses the `autoloading mechanism`_ to delegate the loading of a file
21-
defining the class. Symfony provides three autoloaders, which are able to
22-
load your classes:
23-
24-
* :doc:`/components/class_loader/class_loader`: loads classes that follow
25-
the `PSR-0`_ class naming standard;
26-
27-
* :doc:`/components/class_loader/psr4_class_loader`: loads classes that follow
28-
the `PSR-4`_ class naming standard;
29-
30-
* :doc:`/components/class_loader/map_class_loader`: loads classes using
31-
a static map from class name to file path.
32-
33-
Additionally, the Symfony ClassLoader component ships with a wrapper class
34-
which makes it possible
35-
:doc:`to cache the results of a class loader </components/class_loader/cache_class_loader>`.
36-
37-
When using the :doc:`Debug component </components/debug>`, you
38-
can also use a special :ref:`DebugClassLoader <component-debug-class-loader>`
39-
that eases debugging by throwing more helpful exceptions when a class could
40-
not be found by a class loader.
41-
42-
Installation
43-
------------
44-
45-
You can install the component in 2 different ways:
46-
47-
* :doc:`Install it via Composer </components/using_components>` (``symfony/class-loader``
48-
on `Packagist`_);
49-
* Use the official Git repository (https://github.com/symfony/class-loader).
50-
51-
.. include:: /components/require_autoload.rst.inc
52-
53-
Learn More
54-
----------
55-
56-
.. toctree::
57-
:glob:
58-
:maxdepth: 1
59-
60-
class_loader/class_loader
61-
class_loader/class_map_generator.rst
62-
class_loader/debug_class_loader.rst
63-
class_loader/map_class_loader.rst
64-
class_loader/psr4_class_loader.rst
65-
66-
.. toctree::
67-
:hidden:
68-
69-
class_loader/cache_class_loader
9+
The ClassLoader component was removed in Symfony 4.0. As an alternative, use
10+
any of the `class loading optimizations`_ provided by Composer.
7011

71-
.. _PSR-0: http://www.php-fig.org/psr/psr-0/
72-
.. _PSR-4: http://www.php-fig.org/psr/psr-4/
73-
.. _`autoloading mechanism`: http://php.net/manual/en/language.oop5.autoload.php
74-
.. _Packagist: https://packagist.org/packages/symfony/class-loader
7512
.. _`class loading optimizations`: https://getcomposer.org/doc/articles/autoloader-optimization.md

‎components/class_loader/cache_class_loader.rst

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎components/class_loader/class_loader.rst

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0