Skip to content

Commit 9102475

Browse files
authored
Merge branch '4.0' into remove_email_articles
2 parents 90ad1af + 444a49a commit 9102475

File tree

200 files changed

+1944
-5314
lines changed

Some content is hidden

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

200 files changed

+1944
-5314
lines changed

_build/redirection_map

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,18 +138,21 @@
138138
/cookbook/deployment/platformsh /deployment/platformsh
139139
/cookbook/deployment/tools /deployment/tools
140140
/cookbook/doctrine/common_extensions /doctrine/common_extensions
141-
/cookbook/doctrine/console /doctrine/console
141+
/cookbook/doctrine/console /doctrine
142142
/cookbook/doctrine/custom_dql_functions /doctrine/custom_dql_functions
143143
/cookbook/doctrine/dbal /doctrine/dbal
144144
/cookbook/doctrine/event_listeners_subscribers /doctrine/event_listeners_subscribers
145145
/cookbook/doctrine/index /doctrine
146-
/cookbook/doctrine/mapping_model_classes /doctrine/mapping_model_classes
146+
/cookbook/doctrine/mapping_model_classes /doctrine
147+
/doctrine/mapping_model_classes /doctrine
147148
/cookbook/doctrine/mongodb_session_storage /doctrine/mongodb_session_storage
148149
/cookbook/doctrine/multiple_entity_managers /doctrine/multiple_entity_managers
149150
/cookbook/doctrine/pdo_session_storage /doctrine/pdo_session_storage
150151
/cookbook/doctrine/registration_form /doctrine/registration_form
151152
/cookbook/doctrine/resolve_target_entity /doctrine/resolve_target_entity
152153
/cookbook/doctrine/reverse_engineering /doctrine/reverse_engineering
154+
/doctrine/repository /doctrine
155+
/doctrine/console /doctrine
153156
/cookbook/email/cloud /email
154157
/cookbook/email/dev_environment /email/dev_environment
155158
/cookbook/email/email /email
@@ -197,7 +200,7 @@
197200
/cookbook/psr7 /components/psr7
198201
/cookbook/request/index /request
199202
/cookbook/request/load_balancer_reverse_proxy /deployment/proxies
200-
/cookbook/request/mime_type /reference/configuration/framework#formats
203+
/cookbook/request/mime_type /reference/configuration/framework
201204
/cookbook/routing/conditions /routing/conditions
202205
/cookbook/routing/custom_route_loader /routing/custom_route_loader
203206
/cookbook/routing/debug /routing/debug
@@ -247,7 +250,8 @@
247250
/cookbook/service_container/shared /service_container/shared
248251
/cookbook/session/avoid_session_start /session/avoid_session_start
249252
/cookbook/session/index /session
250-
/cookbook/session/limit_metadata_writes /session/limit_metadata_writes
253+
/cookbook/session/limit_metadata_writes /reference/configuration/framework
254+
/session/limit_metadata_writes /reference/configuration/framework
251255
/cookbook/session/locale_sticky_session /session/locale_sticky_session
252256
/cookbook/session/php_bridge /session/php_bridge
253257
/cookbook/session/proxy_examples /session/proxy_examples
@@ -291,10 +295,18 @@
291295
/components/browser_kit/introduction /components/browser_kit
292296
/components/class_loader/introduction /components/class_loader
293297
/components/class_loader/index /components/class_loader
298+
/components/class_loader/cache_class_loader /components/class_loader
299+
/components/class_loader/class_loader /components/class_loader
300+
/components/class_loader/class_map_generator /components/class_loader
301+
/components/class_loader/debug_class_loader /components/class_loader
302+
/components/class_loader/map_class_loader /components/class_loader
303+
/components/class_loader/map_class_loader /components/class_loader
304+
/components/class_loader/psr4_class_loader /components/class_loader
294305
/components/config/introduction /components/config
295306
/components/config/index /components/config
296307
/components/console/helpers/tablehelper /components/console/helpers/table
297308
/components/console/helpers/progresshelper /components/console/helpers/progressbar
309+
/components/console/helpers/dialoghelper /components/console/helpers/questionhelper
298310
/components/console/introduction /components/console
299311
/components/console/index /components/console
300312
/components/debug/class_loader /components/debug
@@ -346,13 +358,21 @@
346358
/components/var_dumper/index /components/var_dumper
347359
/components/yaml/introduction /components/yaml
348360
/components/yaml/index /components/yaml
361+
/console/logging /console
349362
/deployment/tools /deployment
350363
/install/bundles /setup/bundles
351364
/email/gmail /email
352365
/email/cloud /email
353366
/event_dispatcher/class_extension /event_dispatcher
354367
/form /forms
355368
/form/use_virtual_forms /form/inherit_data_option
369+
/frontend/assetic/apply_to_option /frontend/assetic
370+
/frontend/assetic/asset_management /frontend/assetic
371+
/frontend/assetic/jpeg_optimize /frontend/assetic
372+
/frontend/assetic/php /frontend/assetic
373+
/frontend/assetic/uglifyjs /frontend/assetic
374+
/frontend/assetic/yuicompressor /frontend/assetic
375+
/reference/configuration/assetic /frontend/assetic
356376
/security/target_path /security
357377
/service_container/third_party /service_container
358378
/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.

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

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.

components/class_loader/class_map_generator.rst

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

0 commit comments

Comments
 (0)