Skip to content
Browse files

Merge branch '2.0'

Conflicts:
	reference/configuration/web_profiler.rst
  • Loading branch information...
2 parents a16022c + 26875e7 commit b55b984a7605abeeebfd7c706b94a475d1ce80b9 @weaverryan weaverryan committed
Showing with 121 additions and 133 deletions.
  1. +2 −2 book/http_cache.rst
  2. +3 −3 book/service_container.rst
  3. +3 −0 book/stable_api.rst
  4. +4 −7 components/dependency_injection/compilation.rst
  5. +0 −78 components/dependency_injection/introduction.rst
  6. +3 −0 components/yaml.rst
  7. +1 −0 contributing/documentation/translations.rst
  8. +1 −1 cookbook/assetic/apply_to_option.rst
  9. +1 −1 cookbook/assetic/jpeg_optimize.rst
  10. +2 −2 cookbook/bundles/best_practices.rst
  11. +2 −2 cookbook/bundles/extension.rst
  12. +1 −1 cookbook/configuration/environments.rst
  13. +4 −0 cookbook/controller/error_pages.rst
  14. +3 −0 cookbook/doctrine/common_extensions.rst
  15. +4 −1 cookbook/doctrine/custom_dql_functions.rst
  16. +4 −1 cookbook/doctrine/event_listeners_subscribers.rst
  17. +4 −0 cookbook/doctrine/file_uploads.rst
  18. +3 −0 cookbook/doctrine/multiple_entity_managers.rst
  19. +3 −0 cookbook/email/dev_environment.rst
  20. +3 −0 cookbook/email/spool.rst
  21. +3 −0 cookbook/form/data_transformers.rst
  22. +1 −1 cookbook/form/use_virtuals_forms.rst
  23. +3 −0 cookbook/logging/monolog_email.rst
  24. +3 −0 cookbook/security/force_https.rst
  25. +3 −0 cookbook/security/form_login.rst
  26. +3 −0 cookbook/security/remember_me.rst
  27. +4 −0 cookbook/security/securing_services.rst
  28. +4 −0 cookbook/service_container/compiler_passes.rst
  29. +3 −0 cookbook/service_container/scopes.rst
  30. +3 −0 cookbook/symfony1.rst
  31. +1 −1 cookbook/testing/insulating_clients.rst
  32. +3 −0 cookbook/workflow/new_project_git.rst
  33. +3 −0 cookbook/workflow/new_project_svn.rst
  34. +2 −2 reference/configuration/assetic.rst
  35. +2 −2 reference/configuration/doctrine.rst
  36. +1 −1 reference/configuration/framework.rst
  37. +1 −1 reference/configuration/monolog.rst
  38. +1 −1 reference/configuration/security.rst
  39. +1 −1 reference/configuration/swiftmailer.rst
  40. +1 −1 reference/configuration/twig.rst
  41. +23 −22 reference/configuration/web_profiler.rst
  42. +1 −1 reference/forms/types/options/by_reference.rst.inc
View
4 book/http_cache.rst
@@ -290,7 +290,7 @@ which is actually a collection of various cache information.
:ref:`http-expiration-validation` section.
.. index::
- single: Cache; Cache-Control Header
+ single: Cache; Cache-Control header
single: HTTP headers; Cache-Control
The Cache-Control Header
@@ -624,7 +624,7 @@ code.
whether or not the resource has been updated since it was cached.
.. index::
- single: Cache; Conditional Get
+ single: Cache; Conditional get
single: HTTP; 304
.. _optimizing-cache-validation:
View
6 book/service_container.rst
@@ -1,6 +1,6 @@
.. index::
single: Service Container
- single: Dependency Injection Container
+ single: Dependency Injection; Container
Service Container
=================
@@ -62,7 +62,7 @@ classes is a well-known and trusted object-oriented best-practice. These skills
are key to being a good developer in almost any language.
.. index::
- single: Service Container; What is?
+ single: Service Container; What is a Service Container?
What is a Service Container?
----------------------------
@@ -330,7 +330,7 @@ second method, which is the flexible and preferred method for importing service
configuration from third-party bundles.
.. index::
- single: Service Container; imports
+ single: Service Container; Imports
.. _service-container-imports-directive:
View
3 book/stable_api.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Stable API
+
The Symfony2 Stable API
=======================
View
11 components/dependency_injection/compilation.rst
@@ -1,4 +1,7 @@
-Compiling the Container
+.. index::
+ single: Dependency Injection; Compilation
+
+Compiling the Container
=======================
The service container can be compiled for various reasons. These reasons
@@ -121,14 +124,8 @@ worlds though by using configuration files and then dumping and caching the resu
configuration. The ``PhpDumper`` makes dumping the compiled container easy::
use Symfony\Component\DependencyInjection\ContainerBuilder;
- use Symfony\Component\Config\FileLocator;
- use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Dumper\PhpDumper
- $container = new ContainerBuilder();
- $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
- $loader->load('services.xml');
-
$file = __DIR__ .'/cache/container.php';
if (file_exists($file)) {
View
78 components/dependency_injection/introduction.rst
@@ -279,81 +279,3 @@ The ``newsletter_manager`` and ``mailer`` services can be set up using config fi
$container->register('newsletter_manager', 'NewsletterManager')
->addMethodCall('setMailer', new Reference('mailer');
-Dumping the Configuration for Performance
------------------------------------------
-
-Using configuration files to manage the service container can be much easier
-to understand than using PHP once there are a lot of services. This ease comes
-at a price though when it comes to performance as the config files need to be
-parsed and the PHP configuration built from them. You can have the best of both
-worlds though by using configuration files and then dumping and caching the resulting
-configuration. The ``PhpDumper`` makes dumping the compiled container easy::
-
- use Symfony\Component\DependencyInjection\ContainerBuilder;
- use Symfony\Component\Config\FileLocator;
- use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
- use Symfony\Component\DependencyInjection\Dumper\PhpDumper
-
- $container = new ContainerBuilder();
- $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
- $loader->load('services.xml');
-
- $file = __DIR__ .'/cache/container.php';
-
- if (file_exists($file)) {
- require_once $file;
- $container = new ProjectServiceContiner();
- } else {
- $container = new ContainerBuilder();
- $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
- $loader->load('services.xml');
-
- $dumper = new PhpDumper($container);
- file_put_contents($file, $dumper->dump());
- }
-
-``ProjectServiceContiner`` is the default name given to the dumped container
-class, you can change this though this with the ``class`` option when you dump
-it::
-
- // ...
- $file = __DIR__ .'/cache/container.php';
-
- if (file_exists($file)) {
- require_once $file;
- $container = new MyCachedContainer();
- } else {
- $container = new ContainerBuilder();
- $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
- $loader->load('services.xml');
-
- $dumper = new PhpDumper($container);
- file_put_contents($file, $dumper->dump(array('class' => 'MyCachedContainer')));
- }
-
-You will now get the speed of the PHP configured container with the ease of using
-configuration files. In the above example you will need to delete the cached
-container file whenever you make any changes. Adding a check for a variable that
-determines if you are in debug mode allows you to keep the speed of the cached
-container in production but getting an up to date configuration whilst developing
-your application::
-
- // ...
-
- // set $isDebug based on something in your project
-
- $file = __DIR__ .'/cache/container.php';
-
- if (!$isDebug && file_exists($file)) {
- require_once $file;
- $container = new MyCachedContainer();
- } else {
- $container = new ContainerBuilder();
- $loader = new XmlFileLoader($container, new FileLocator(__DIR__));
- $loader->load('services.xml');
-
- if(!$isDebug) {
- $dumper = new PhpDumper($container);
- file_put_contents($file, $dumper->dump(array('class' => 'MyCachedContainer')));
- }
- }
View
3 components/yaml.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Yaml
+
The YAML Component
==================
View
1 contributing/documentation/translations.rst
@@ -24,6 +24,7 @@ for. Here is the list of the official *master* repositories:
* *Romanian*: https://github.com/sebio/symfony-docs-ro
* *Russian*: https://github.com/avalanche123/symfony-docs-ru
* *Spanish*: https://github.com/gitnacho/symfony-docs-es
+* *Turkish*: https://github.com/symfony-tr/symfony-docs-tr
.. note::
View
2 cookbook/assetic/apply_to_option.rst
@@ -1,5 +1,5 @@
.. index::
- single: Assetic; Apply Filters
+ single: Assetic; Apply filters
How to Apply an Assetic Filter to a Specific File Extension
===========================================================
View
2 cookbook/assetic/jpeg_optimize.rst
@@ -1,5 +1,5 @@
.. index::
- single: Assetic; Image Optimization
+ single: Assetic; Image optimization
How to Use Assetic For Image Optimization with Twig Functions
=============================================================
View
4 cookbook/bundles/best_practices.rst
@@ -1,5 +1,5 @@
.. index::
- single: Bundles; Best Practices
+ single: Bundles; Best practices
Bundle Structure and Best Practices
===================================
@@ -9,7 +9,7 @@ from classes to controllers and web resources. Even if bundles are very
flexible, you should follow some best practices if you want to distribute them.
.. index::
- pair: Bundles; Naming Conventions
+ pair: Bundles; Naming conventions
.. _bundles-naming-conventions:
View
4 cookbook/bundles/extension.rst
@@ -1,6 +1,6 @@
.. index::
single: Configuration; Semantic
- single: Bundle; Extension Configuration
+ single: Bundle; Extension configuration
How to expose a Semantic Configuration for a Bundle
===================================================
@@ -90,7 +90,7 @@ The second method has several specific advantages:
.. index::
single: Bundles; Extension
- single: Dependency Injection, Extension
+ single: Dependency Injection; Extension
Creating an Extension Class
---------------------------
View
2 cookbook/configuration/environments.rst
@@ -1,5 +1,5 @@
.. index::
- single: Environments;
+ single: Environments
How to Master and Create new Environments
=========================================
View
4 cookbook/controller/error_pages.rst
@@ -1,3 +1,7 @@
+.. index::
+ single: Controller; Customize error pages
+ single: Error pages
+
How to customize Error Pages
============================
View
3 cookbook/doctrine/common_extensions.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Doctrine; Common extensions
+
Doctrine Extensions: Timestampable, Sluggable, Translatable, etc.
=================================================================
View
5 cookbook/doctrine/custom_dql_functions.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Doctrine; Custom DQL functions
+
Registering Custom DQL Functions
================================
@@ -77,4 +80,4 @@ In Symfony, you can register your custom DQL functions as follows:
),
));
-.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/cookbook/dql-user-defined-functions.html
+.. _`DQL User Defined Functions`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/cookbook/dql-user-defined-functions.html
View
5 cookbook/doctrine/event_listeners_subscribers.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Doctrine; Event listeners and subscribers
+
.. _doctrine-event-config:
Registering Event Listeners and Subscribers
@@ -111,4 +114,4 @@ specific type of entity (e.g. a ``Product`` entity but not a ``BlogPost``
entity), you should check for the class name of the entity in your method
(as shown above).
-.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
+.. _`The Event System`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html
View
4 cookbook/doctrine/file_uploads.rst
@@ -1,3 +1,7 @@
+.. index::
+ single: Doctrine; File uploads
+
+
How to handle File Uploads with Doctrine
========================================
View
3 cookbook/doctrine/multiple_entity_managers.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Doctrine; Multiple entity managers
+
How to work with Multiple Entity Managers
=========================================
View
3 cookbook/email/dev_environment.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Emails; In development
+
How to Work with Emails During Development
==========================================
View
3 cookbook/email/spool.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Emails; Spooling
+
How to Spool Email
==================
View
3 cookbook/form/data_transformers.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Form; Data transformers
+
Using Data Transformers
=======================
View
2 cookbook/form/use_virtuals_forms.rst
@@ -1,5 +1,5 @@
.. index::
- single: Form; Use virtual forms
+ single: Form; Virtual forms
How to use the Virtual Form Field Option
========================================
View
3 cookbook/logging/monolog_email.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Logging; Emailling errors
+
How to Configure Monolog to Email Errors
========================================
View
3 cookbook/security/force_https.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Security; Force HTTPS
+
How to force HTTPS or HTTP for Different URLs
=============================================
View
3 cookbook/security/form_login.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Security; Customizing form login
+
How to customize your Form Login
================================
View
3 cookbook/security/remember_me.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Security; "Remember me"
+
How to add "Remember Me" Login Functionality
============================================
View
4 cookbook/security/securing_services.rst
@@ -1,3 +1,7 @@
+.. index::
+ single: Security; Securing any service
+ single: Security; Securing any method
+
How to secure any Service or Method in your Application
=======================================================
View
4 cookbook/service_container/compiler_passes.rst
@@ -1,3 +1,7 @@
+.. index::
+ single: Dependency Injection; Compiler passes
+ single: Service Container; Compiler passes
+
How to work with Compiler Passes in Bundles
===========================================
View
3 cookbook/service_container/scopes.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Dependency Injection; Scopes
+
How to work with Scopes
=======================
View
3 cookbook/symfony1.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: symfony1
+
How Symfony2 differs from symfony1
==================================
View
2 cookbook/testing/insulating_clients.rst
@@ -1,5 +1,5 @@
.. index::
- single: Tests
+ single: Tests; Insulating clients
How to test the Interaction of several Clients
==============================================
View
3 cookbook/workflow/new_project_git.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Workflow; Git
+
How to Create and store a Symfony2 Project in git
=================================================
View
3 cookbook/workflow/new_project_svn.rst
@@ -1,3 +1,6 @@
+.. index::
+ single: Workflow; Subversion
+
How to Create and store a Symfony2 Project in Subversion
========================================================
View
4 reference/configuration/assetic.rst
@@ -1,5 +1,5 @@
.. index::
- pair: Assetic; Configuration Reference
+ pair: Assetic; Configuration reference
AsseticBundle Configuration Reference
=====================================
@@ -51,4 +51,4 @@ Full Default Configuration
twig:
functions:
# An array of named functions (e.g. some_function, some_other_function)
- some_function: []
+ some_function: []
View
4 reference/configuration/doctrine.rst
@@ -1,6 +1,6 @@
.. index::
- single: Doctrine; ORM Configuration Reference
- single: Configuration Reference; Doctrine ORM
+ single: Doctrine; ORM configuration reference
+ single: Configuration reference; Doctrine ORM
Configuration Reference
=======================
View
2 reference/configuration/framework.rst
@@ -1,5 +1,5 @@
.. index::
- single: Configuration Reference; Framework
+ single: Configuration reference; Framework
FrameworkBundle Configuration ("framework")
===========================================
View
2 reference/configuration/monolog.rst
@@ -1,5 +1,5 @@
.. index::
- pair: Monolog; Configuration Reference
+ pair: Monolog; Configuration reference
Configuration Reference
=======================
View
2 reference/configuration/security.rst
@@ -1,5 +1,5 @@
.. index::
- single: Security; Configuration Reference
+ single: Security; Configuration reference
Security Configuration Reference
================================
View
2 reference/configuration/swiftmailer.rst
@@ -1,5 +1,5 @@
.. index::
- single: Configuration Reference; Swiftmailer
+ single: Configuration reference; Swiftmailer
SwiftmailerBundle Configuration ("swiftmailer")
===============================================
View
2 reference/configuration/twig.rst
@@ -1,5 +1,5 @@
.. index::
- pair: Twig; Configuration Reference
+ pair: Twig; Configuration reference
TwigBundle Configuration Reference
==================================
View
45 reference/configuration/web_profiler.rst
@@ -1,22 +1,23 @@
-.. index::
- single: Configuration Reference; WebProfiler
-
-WebProfilerBundle Configuration
-===============================
-
-Full Default Configuration
---------------------------
-
-.. configuration-block::
-
- .. code-block:: yaml
-
- web_profiler:
-
- # DEPRECATED, it is not useful anymore and can be removed safely from your configuration
- verbose: true
-
- # display the web debug toolbar at the bottom of pages with a summary of profiler info
- toolbar: false
- position: bottom
- intercept_redirects: false
+.. index::
+ single: Configuration reference; WebProfiler
+
+WebProfilerBundle Configuration
+===============================
+
+Full Default Configuration
+--------------------------
+
+.. configuration-block::
+
+ .. code-block:: yaml
+
+ web_profiler:
+
+ # DEPRECATED, it is not useful anymore and can be removed safely from your configuration
+ verbose: true
+
+ # display the web debug toolbar at the bottom of pages with a summary of profiler info
+ toolbar: false
+ position: bottom
+ intercept_redirects: false
+
View
2 reference/forms/types/options/by_reference.rst.inc
@@ -28,7 +28,7 @@ when you call ``bindRequest`` on the form::
Notice that ``setAuthor`` is not called. The author is modified by reference.
-If we set ``by_reference`` to false, binding looks like this:
+If we set ``by_reference`` to false, binding looks like this::
$article->setTitle('...');
$author = $article->getAuthor();

0 comments on commit b55b984

Please sign in to comment.
Something went wrong with that request. Please try again.