Skip to content

Commit 05df41b

Browse files
committed
Merge branch '4.0'
* 4.0: (36 commits) Update event_listeners_subscribers.rst Update event_listeners_subscribers.rst [#8683] Tweaks based on feedback [#8643] Removing default values [#8734][#8736] Adding missing installation details fixes thanks to the team! add missing link target for Ansistrano Restored the Assetic tags because they are removed in another PR Corrected a spelling error. Updated Doctrine config reference about bundles Fixed PHP form theme resources Remove App\Bridge\Doctrine\ namespace Fixed the last references to security.yml Updated the main security article Updated security/* articles to Symfony 4 (WIP) Updated security/* articles to Symfony 4 Fixing build problems tweaks thanks to @yceruto updating the rest of the Doctrine docs Update Custom UsernamePasswordToken Authenticator ...
2 parents bbbfb10 + 6c54c78 commit 05df41b

File tree

136 files changed

+1651
-2416
lines changed

Some content is hidden

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

136 files changed

+1651
-2416
lines changed

_build/redirection_map

Lines changed: 8 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/cloud
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

configuration/front_controllers_and_kernel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ to `decorate`_ the kernel with additional features. Examples include:
4141

4242
* Configuring the autoloader or adding additional autoloading mechanisms;
4343
* Adding HTTP level caching by wrapping the kernel with an instance of
44-
:ref:`AppCache <symfony-gateway-cache>`;
44+
:ref:`HttpCache <symfony-gateway-cache>`;
4545
* Enabling the :doc:`Debug Component </components/debug>`.
4646

4747
You can choose the front controller that's used by adding it in the URL, like:

deployment.rst

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,15 @@ Using Build Scripts and other Tools
7777
There are also tools to help ease the pain of deployment. Some of them have been
7878
specifically tailored to the requirements of Symfony.
7979

80-
`Capistrano`_ with `Symfony plugin`_
81-
`Capistrano`_ is a remote server automation and deployment tool written in Ruby.
82-
`Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
83-
(which works only with Capistrano 2).
80+
`EasyDeployBundle`_
81+
A Symfony bundle that adds easy deploy tools to your application.
8482

85-
`sf2debpkg`_
86-
Helps you build a native Debian package for your Symfony project.
83+
`Deployer`_
84+
This is another native PHP rewrite of Capistrano, with some ready recipes for
85+
Symfony.
86+
87+
`Ansistrano`_
88+
An Ansible role that allows you to configure a powerful deploy via YAML files.
8789

8890
`Magallanes`_
8991
This Capistrano-like deployment tool is built in PHP, and may be easier
@@ -93,13 +95,14 @@ specifically tailored to the requirements of Symfony.
9395
This Python-based library provides a basic suite of operations for executing
9496
local or remote shell commands and uploading/downloading files.
9597

96-
`Deployer`_
97-
This is another native PHP rewrite of Capistrano, with some ready recipes for
98-
Symfony.
98+
`Capistrano`_ with `Symfony plugin`_
99+
`Capistrano`_ is a remote server automation and deployment tool written in Ruby.
100+
`Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
101+
(which works only with Capistrano 2).
102+
103+
`sf2debpkg`_
104+
Helps you build a native Debian package for your Symfony project.
99105

100-
Bundles
101-
There are some `bundles that add deployment features`_ directly into your
102-
Symfony console.
103106

104107
Basic scripting
105108
You can of course use shell, `Ant`_ or any other build tool to script
@@ -246,9 +249,9 @@ Learn More
246249
.. _`Capistrano`: http://capistranorb.com/
247250
.. _`sf2debpkg`: https://github.com/liip/sf2debpkg
248251
.. _`Fabric`: http://www.fabfile.org/
252+
.. _`Ansistrano`: https://ansistrano.com/
249253
.. _`Magallanes`: https://github.com/andres-montanez/Magallanes
250254
.. _`Ant`: http://blog.sznapka.pl/deploying-symfony2-applications-with-ant
251-
.. _`bundles that add deployment features`: https://github.com/search?utf8=✓&q=topic%3Asymfony-bundle+topic%3Adeploy&type=Repositories&ref=searchresults
252255
.. _`Memcached`: http://memcached.org/
253256
.. _`Redis`: http://redis.io/
254257
.. _`Symfony plugin`: https://github.com/capistrano/symfony/
@@ -258,3 +261,4 @@ Learn More
258261
.. _`platform.sh`: https://docs.platform.sh/frameworks/symfony.html
259262
.. _`Azure`: https://azure.microsoft.com/en-us/develop/php/
260263
.. _`fortrabbit`: https://help.fortrabbit.com/install-symfony
264+
.. _`EasyDeployBundle`: https://github.com/EasyCorp/easy-deploy-bundle

0 commit comments

Comments
 (0)