Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbbb72b4

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: (52 commits) this sounds just a little bit more natural Update dynamic_form_modification.rst Remove colloquialism "hold on" fixing reference to deprecated class removing use statement for consistency with other places in this doc fix FlattenException namespace Tweaks thanks to close review from Javier and@snoek09! Remove AcmeDemoBundle references Fix reference to output object Subject-verb agreement fixed missing level in namespace Fix tense and sentence length Fix typo in external_parameters.rst line break Removing the alias stuff - not required aftersymfony/symfony#17074 Fixed the main index page redirections Fixed the redirection for "upgrade" articles Added all the missing "index pages" redirections Fixed a Console article redirection Fixed the redirection of the previous "performance" book chapter ...
2 parents19cc445 +732bb33 commitbbb72b4

File tree

17 files changed

+417
-80
lines changed

17 files changed

+417
-80
lines changed

‎.platform.app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ dependencies:
5252
hooks:
5353
build:|
5454
pip install git+https://github.com/fabpot/sphinx-php.git
55-
make html
55+
make-C _buildhtml

‎_build/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
SPHINXOPTS =
66
SPHINXBUILD = sphinx-build
77
PAPER =
8-
BUILDDIR =_build
8+
BUILDDIR =.
99

1010
# Internal variables.
1111
PAPEROPT_a4 = -D latex_paper_size=a4
1212
PAPEROPT_letter = -D latex_paper_size=letter
13-
ALLSPHINXOPTS = -d$(BUILDDIR)/doctrees$(PAPEROPT_$(PAPER))$(SPHINXOPTS) .
13+
ALLSPHINXOPTS = -c$(BUILDDIR) -d$(BUILDDIR)/doctrees$(PAPEROPT_$(PAPER))$(SPHINXOPTS) ../
1414
# the i18n builder cannot share the environment and doctrees with the others
1515
I18NSPHINXOPTS =$(PAPEROPT_$(PAPER))$(SPHINXOPTS) .
1616

‎_build/redirection_map‎

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/book/index /index
2+
/cookbook/index /index
13
/book/stable_api /contributing/code/bc
24
/book/internals /reference/events
35
/cookbook/console/sending_emails /cookbook/console/request_context
@@ -73,56 +75,63 @@
7375
/book/from_flat_php_to_symfony2 /introduction/from_flat_php_to_symfony2
7476
/book/configuration /configuration
7577
/book/propel /propel/propel
76-
/book/performance /performance/performance
78+
/book/performance /performance
7779
/cookbook/assetic/apply_to_option /assetic/apply_to_option
7880
/cookbook/assetic/asset_management /assetic/asset_management
81+
/cookbook/assetic/index /assetic
7982
/cookbook/assetic/jpeg_optimize /assetic/jpeg_optimize
8083
/cookbook/assetic/php /assetic/php
8184
/cookbook/assetic/uglifyjs /assetic/uglifyjs
8285
/cookbook/assetic/yuicompressor /assetic/yuicompressor
8386
/cookbook/bundles/best_practices /bundles/best_practices
8487
/cookbook/bundles/configuration /bundles/configuration
8588
/cookbook/bundles/extension /bundles/extension
89+
/cookbook/bundles/index /bundles
8690
/cookbook/bundles/inheritance /bundles/inheritance
8791
/cookbook/bundles/installation /bundles/installation
8892
/cookbook/bundles/override /bundles/override
8993
/cookbook/bundles/prepend_extension /bundles/prepend_extension
9094
/cookbook/bundles/remove /bundles/remove
91-
/cookbook/cache/form_csrf_caching /cache/form_csrf_caching
92-
/cookbook/cache/varnish /cache/varnish
95+
/cookbook/cache/form_csrf_caching /http_cache/form_csrf_caching
96+
/cookbook/cache/varnish /http_cache/varnish
9397
/cookbook/composer /setup/composer
9498
/cookbook/configuration/apache_router /configuration/apache_router
9599
/cookbook/configuration/configuration_organization /configuration/configuration_organization
96100
/cookbook/configuration/environments /configuration/environments
97101
/cookbook/configuration/external_parameters /configuration/external_parameters
98102
/cookbook/configuration/front_controllers_and_kernel /configuration/front_controllers_and_kernel
99103
/cookbook/configuration/micro-kernel-trait /configuration/micro_kernel_trait
104+
/cookbook/configuration/index /configuration
100105
/cookbook/configuration/override_dir_structure /configuration/override_dir_structure
101106
/cookbook/configuration/using_parameters_in_dic /configuration/using_parameters_in_dic
102107
/cookbook/configuration/web_server_configuration /setup/web_server_configuration
103108
/cookbook/console/command_in_controller /console/command_in_controller
104109
/cookbook/console/commands_as_services /console/commands_as_services
105-
/cookbook/console/console_command /console/console_command
110+
/cookbook/console/console_command /console
111+
/cookbook/console/index /console
106112
/cookbook/console/logging /console/logging
107113
/cookbook/console/request_context /console/request_context
108114
/cookbook/console/style /console/style
109115
/cookbook/console/usage /console/usage
110116
/cookbook/controller/csrf_token_validation /controller/csrf_token_validation
111117
/cookbook/controller/error_pages /controller/error_pages
112118
/cookbook/controller/forwarding /controller/forwarding
119+
/cookbook/controller/index /controller
113120
/cookbook/controller/service /controller/service
114121
/cookbook/controller/upload_file /controller/upload_file
115122
/cookbook/debugging /debug/debugging
116123
/cookbook/deployment/azure-website /cookbook/azure-website
117124
/cookbook/deployment/fortrabbit /deployment/fortrabbit
118125
/cookbook/deployment/heroku /deployment/heroku
126+
/cookbook/deployment/index /deployment
119127
/cookbook/deployment/platformsh /deployment/platformsh
120128
/cookbook/deployment/tools /deployment/tools
121129
/cookbook/doctrine/common_extensions /doctrine/common_extensions
122130
/cookbook/doctrine/console /doctrine/console
123131
/cookbook/doctrine/custom_dql_functions /doctrine/custom_dql_functions
124132
/cookbook/doctrine/dbal /doctrine/dbal
125133
/cookbook/doctrine/event_listeners_subscribers /doctrine/event_listeners_subscribers
134+
/cookbook/doctrine/index /doctrine
126135
/cookbook/doctrine/mapping_model_classes /doctrine/mapping_model_classes
127136
/cookbook/doctrine/mongodb_session_storage /doctrine/mongodb_session_storage
128137
/cookbook/doctrine/multiple_entity_managers /doctrine/multiple_entity_managers
@@ -134,11 +143,13 @@
134143
/cookbook/email/dev_environment /email/dev_environment
135144
/cookbook/email/email /email
136145
/cookbook/email/gmail /email/gmail
146+
/cookbook/email/index /email
137147
/cookbook/email/spool /email/spool
138148
/cookbook/email/testing /email/testing
139149
/cookbook/event_dispatcher/before_after_filters /event_dispatcher/before_after_filters
140150
/cookbook/event_dispatcher/class_extension /event_dispatcher/class_extension
141151
/cookbook/event_dispatcher/event_listener /event_dispatcher
152+
/cookbook/event_dispatcher/index /event_dispatcher
142153
/cookbook/event_dispatcher/method_behavior /event_dispatcher/method_behavior
143154
/cookbook/expressions /expressions/expressions
144155
/cookbook/form/create_custom_field_type /form/create_custom_field_type
@@ -148,32 +159,39 @@
148159
/cookbook/form/dynamic_form_modification /form/dynamic_form_modification
149160
/cookbook/form/form_collections /form/form_collections
150161
/cookbook/form/form_customization /form/form_customization
162+
/cookbook/form/index /forms
151163
/cookbook/form/inherit_data_option /form/inherit_data_option
152164
/cookbook/form/unit_testing /form/unit_testing
153165
/cookbook/form/use_empty_data /form/use_empty_data
154166
/cookbook/frontend/bower /frontend/bower
167+
/cookbook/frontend/index /frontend
155168
/cookbook/install/unstable_versions /setup/unstable_versions
156169
/cookbook/install/bundles /setup/bundles
170+
/cookbook/install/index /setup
157171
/cookbook/install/upgrade_major /setup/upgrade_major
158172
/cookbook/install/upgrade_minor /setup/upgrade_minor
159173
/cookbook/install/upgrade_patch /setup/upgrade_patch
160174
/cookbook/logging/channels_handlers /logging/channels_handlers
175+
/cookbook/logging/index /logging
161176
/cookbook/logging/monolog /logging
162177
/cookbook/logging/monolog_console /logging/monolog_console
163178
/cookbook/logging/monolog_email /logging/monolog_email
164179
/cookbook/logging/monolog_regex_based_excludes /logging/monolog_regex_based_excludes
165180
/cookbook/profiler/data_collector /profiler/data_collector
181+
/cookbook/profiler/index /profiler
166182
/cookbook/profiler/matchers /profiler/matchers
167183
/cookbook/profiler/profiling_data /profiler/profiling_data
168184
/cookbook/profiler/storage /profiler/storage
169-
/cookbook/psr7 /psr/psr7
185+
/cookbook/psr7 /request/psr7
186+
/cookbook/request/index /request
170187
/cookbook/request/load_balancer_reverse_proxy /request/load_balancer_reverse_proxy
171188
/cookbook/request/mime_type /request/mime_type
172189
/cookbook/routing/conditions /routing/conditions
173190
/cookbook/routing/custom_route_loader /routing/custom_route_loader
174191
/cookbook/routing/debug /routing/debug
175192
/cookbook/routing/external_resources /routing/external_resources
176193
/cookbook/routing/extra_information /routing/extra_information
194+
/cookbook/routing/index /routing
177195
/cookbook/routing/method_parameters /routing/requirements
178196
/cookbook/routing/optional_placeholders /routing/optional_placeholders
179197
/cookbook/routing/redirect_in_config /routing/redirect_in_config
@@ -201,6 +219,7 @@
201219
/cookbook/security/impersonating_user /security/impersonating_user
202220
/cookbook/security/ldap /security/ldap
203221
/cookbook/security/multiple_guard_authenticators /security/multiple_guard_authenticators
222+
/cookbook/security/index /security
204223
/cookbook/security/multiple_user_providers /security/multiple_user_providers
205224
/cookbook/security/named_encoders /security/named_encoders
206225
/cookbook/security/pre_authenticated /security/pre_authenticated
@@ -211,16 +230,19 @@
211230
/cookbook/security/voters /security/voters
212231
/cookbook/serializer /serializer
213232
/cookbook/service_container/compiler_passes /service_container/compiler_passes
233+
/cookbook/service_container/index /service_container
214234
/cookbook/service_container/scopes /service_container/scopes
215235
/cookbook/service_container/shared /service_container/shared
216236
/cookbook/session/avoid_session_start /session/avoid_session_start
237+
/cookbook/session/index /session
217238
/cookbook/session/limit_metadata_writes /session/limit_metadata_writes
218239
/cookbook/session/locale_sticky_session /session/locale_sticky_session
219240
/cookbook/session/php_bridge /session/php_bridge
220241
/cookbook/session/proxy_examples /session/proxy_examples
221242
/cookbook/session/sessions_directory /session/sessions_directory
222243
/cookbook/symfony1 /introduction/symfony1
223244
/cookbook/templating/global_variables /templating/global_variables
245+
/cookbook/templating/index /templating
224246
/cookbook/templating/namespaced_paths /templating/namespaced_paths
225247
/cookbook/templating/PHP /templating/PHP
226248
/cookbook/templating/render_without_controller /templating/render_without_controller
@@ -229,19 +251,25 @@
229251
/cookbook/testing/database /testing/database
230252
/cookbook/testing/doctrine /testing/doctrine
231253
/cookbook/testing/http_authentication /testing/http_authentication
254+
/cookbook/testing/index /testing
232255
/cookbook/testing/insulating_clients /testing/insulating_clients
233256
/cookbook/testing/profiling /testing/profiling
234257
/cookbook/testing/simulating_authentication /testing/simulating_authentication
235258
/cookbook/upgrade/bundles /upgrade/patch_version
236-
/cookbook/upgrade/major_version /upgrade/minor_version
237-
/cookbook/upgrade/minor_version /upgrade/major_version
259+
/cookbook/upgrade/index /setup/upgrade_major
260+
/cookbook/upgrade/major_version /setup/upgrade_minor
261+
/cookbook/upgrade/minor_version /setup/upgrade_major
238262
/cookbook/upgrade/patch_version /upgrade/bundles
239263
/cookbook/validation/custom_constraint /validation/custom_constraint
240264
/cookbook/validation/group_service_resolver /validation/group_service_resolver
265+
/cookbook/validation/index /validation
241266
/cookbook/validation/severity /validation/severity
242267
/cookbook/web_server/built_in /setup/built_in_web_server
243-
/cookbook/web_services/php_soap_extension /web_services/php_soap_extension
268+
/cookbook/web_server/index /setup/built_in_web_server
269+
/cookbook/web_services/index /controller/soap_web_service
270+
/cookbook/web_services/php_soap_extension /controller/soap_web_service
244271
/cookbook/workflow/homestead /setup/homestead
272+
/cookbook/workflow/index /setup
245273
/cookbook/workflow/new_project_git /setup/new_project_git
246274
/cookbook/workflow/new_project_svn /setup/new_project_svn
247275
/components/asset/index /components/asset
@@ -264,10 +292,12 @@
264292
/components/dependency_injection/factories /service_container/factories
265293
/components/dependency_injection/lazy_services /service_container/lazy_services
266294
/components/dependency_injection/parameters /service_container/parameters
295+
/components/dependency_injection/parentservices /service_container/parent_services
267296
/components/dependency_injection/parent_services /service_container/parent_services
268297
/components/dependency_injection/synthetic_services /service_container/synthetic_services
269298
/components/dependency_injection/tags /service_container/tags
270299
/components/dependency_injection/types /service_container/injection_types
300+
/components/event_dispatcher/index /components/event_dispatcher
271301
/components/event_dispatcher/introduction /components/event_dispatcher
272302
/components/expression_language/introduction /components/expression_language
273303
/components/expression_language/index /components/expression_language
@@ -277,6 +307,7 @@
277307
/components/form/introduction /components/form
278308
/components/form/index /components/form
279309
/components/form/type_guesser /form/type_guesser
310+
/components/http_foundation/index /components/http_foundation
280311
/components/http_foundation/introduction /components/http_foundation
281312
/components/http_kernel/introduction /components/http_kernel
282313
/components/http_kernel/index /components/http_kernel

‎bundles/remove.rst‎

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
11
..index::
2-
single: Bundle; RemovingAcmeDemoBundle
2+
single: Bundle; Removinga bundle
33

4-
How to Remove the AcmeDemoBundle
5-
================================
6-
7-
The Symfony Standard Edition comes with a complete demo that lives inside a
8-
bundle called AcmeDemoBundle. It is a great boilerplate to refer to while
9-
starting a project, but you'll probably want to eventually remove it.
10-
11-
..tip::
12-
13-
This article uses the AcmeDemoBundle as an example, but you can use
14-
these steps to remove any bundle.
4+
How to Remove a Bundle
5+
======================
156

167
1. Unregister the Bundle in the ``AppKernel``
178
---------------------------------------------
189

1910
To disconnect the bundle from the framework, you should remove the bundle from
20-
the ``AppKernel::registerBundles()`` method. The bundleis normally found in
21-
the ``$bundles`` arraybut the AcmeDemoBundle is only registered in the
22-
development environment and you can find it insidetheif statement below::
11+
the ``AppKernel::registerBundles()`` method. The bundlewill likely be found in
12+
the ``$bundles`` arraydeclaration or added to it in a later statement if the
13+
bundle is only registered inthedevelopment environment::
2314

2415
// app/AppKernel.php
2516

@@ -28,7 +19,9 @@ development environment and you can find it inside the if statement below::
2819
{
2920
public function registerBundles()
3021
{
31-
$bundles = array(...);
22+
$bundles = array(
23+
new Acme\DemoBundle\AcmeDemoBundle(),
24+
);
3225

3326
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
3427
// comment or remove this line:
@@ -48,8 +41,9 @@ that refers to the bundle.
4841
2.1 Remove Bundle Routing
4942
~~~~~~~~~~~~~~~~~~~~~~~~~
5043

51-
The routing for the AcmeDemoBundle can be found in ``app/config/routing_dev.yml``.
52-
Remove the ``_acme_demo`` entry at the bottom of this file.
44+
*Some* bundles require you to import routing configuration. Check for references
45+
to the bundle in ``app/config/routing.yml`` and ``app/config/routing_dev.yml``.
46+
If you find any references, remove them completely.
5347

5448
2.2 Remove Bundle Configuration
5549
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -60,18 +54,13 @@ quickly spot bundle configuration by looking for an ``acme_demo`` (or whatever
6054
the name of the bundle is, e.g. ``fos_user`` for the FOSUserBundle) string in
6155
the configuration files.
6256

63-
The AcmeDemoBundle doesn't have configuration. However, the bundle is
64-
used in the configuration for the ``app/config/security.yml`` file. You can
65-
use it as a boilerplate for your own security, but you **can** also remove
66-
everything: it doesn't matter to Symfony if you remove it or not.
67-
6857
3. Remove the Bundle from the Filesystem
6958
----------------------------------------
7059

7160
Now you have removed every reference to the bundle in your application, you
72-
should remove the bundle from the filesystem. The bundleislocated in the
73-
``src/Acme/DemoBundle`` directory. You should remove this directory and you
74-
can remove the ``Acme`` directory as well.
61+
should remove the bundle from the filesystem. The bundlewill belocated in
62+
`src/` for example the ``src/Acme/DemoBundle`` directory. You should remove this
63+
directory, and any parent directories that are now empty (e.g. ``src/Acme/``).
7564

7665
..tip::
7766

@@ -91,11 +80,6 @@ Remove the assets of the bundle in the web/ directory (e.g.
9180
4. Remove Integration in other Bundles
9281
--------------------------------------
9382

94-
..note::
95-
96-
This doesn't apply to the AcmeDemoBundle - no other bundles depend
97-
on it, so you can skip this step.
98-
9983
Some bundles rely on other bundles, if you remove one of the two, the other
10084
will probably not work. Be sure that no other bundles, third party or self-made,
10185
rely on the bundle you are about to remove.

‎components/http_kernel.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ below for more details).
548548
The listener has several goals:
549549

550550
1) The thrown exception is converted into a
551-
:class:`Symfony\\Component\\HttpKernel\\Exception\\FlattenException`
551+
:class:`Symfony\\Component\\Debug\\Exception\\FlattenException`
552552
object, which contains all the information about the request, but which
553553
can be printed and serialized.
554554

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp