From b140a70d0d224f27ea926f15d732b2d895e8f7b4 Mon Sep 17 00:00:00 2001 From: Ahmed Siouani Date: Mon, 14 Apr 2014 18:09:26 +0200 Subject: [PATCH 01/17] Fix typo. --- cookbook/form/form_collections.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst index eed8615aa23..8a37f98d227 100644 --- a/cookbook/form/form_collections.rst +++ b/cookbook/form/form_collections.rst @@ -654,11 +654,11 @@ the relationship between the removed ``Tag`` and ``Task`` object. ``Tag`` is properly removed. In Doctrine, you have two side of the relationship: the owning side and the - inverse side. Normally in this case you'll have a many-to-many relation + inverse side. Normally in this case you'll have a many-to-many relationship and the deleted tags will disappear and persist correctly (adding new tags also works effortlessly). - But if you have an one-to-many relation or a many-to-many with a + But if you have a one-to-many relationship or a many-to-many relationship with a ``mappedBy`` on the Task entity (meaning Task is the "inverse" side), you'll need to do more work for the removed tags to persist correctly. From cc0846bb21b21ad71d8c49f47d49866702b2ba76 Mon Sep 17 00:00:00 2001 From: Ahmed Siouani Date: Mon, 14 Apr 2014 20:10:40 +0200 Subject: [PATCH 02/17] add missing 's' for plural. --- cookbook/form/form_collections.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst index 8a37f98d227..27ab0bc74db 100644 --- a/cookbook/form/form_collections.rst +++ b/cookbook/form/form_collections.rst @@ -653,7 +653,7 @@ the relationship between the removed ``Tag`` and ``Task`` object. work to ensure that the relationship between the ``Task`` and the removed ``Tag`` is properly removed. - In Doctrine, you have two side of the relationship: the owning side and the + In Doctrine, you have two sides of the relationship: the owning side and the inverse side. Normally in this case you'll have a many-to-many relationship and the deleted tags will disappear and persist correctly (adding new tags also works effortlessly). From bf9d509b148e5b7b6988cb5ca8fd2d2f82b6636f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 15 Apr 2014 07:53:12 +0200 Subject: [PATCH 03/17] added a note about types we support --- contributing/code/standards.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst index aadcb34ef90..9f2f35b3f11 100644 --- a/contributing/code/standards.rst +++ b/contributing/code/standards.rst @@ -130,6 +130,10 @@ Naming Conventions * Use alphanumeric characters and underscores for file names; +* For type-hinting in PHPDocs and casting, use ``bool`` (instead of ``boolean`` + or ``Boolean``), ``int`` (instead of ``integer``), ``float`` (instead of + ``double`` or ``real``); + * Don't forget to look at the more verbose :doc:`conventions` document for more subjective naming considerations. From 55fd0f8f32dc1db56d21f1c48d80563d1681f3f5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Pavlov Date: Wed, 30 Apr 2014 16:19:50 +0400 Subject: [PATCH 04/17] Update standards.rst Added space line after if statement --- contributing/code/standards.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst index bef7fc3af51..96fddc484da 100644 --- a/contributing/code/standards.rst +++ b/contributing/code/standards.rst @@ -68,6 +68,7 @@ example containing most features described below: if (true === $dummy) { return; } + if ('string' === $dummy) { if ('values' === $mergedOptions['some_default']) { return substr($dummy, 0, 5); @@ -75,6 +76,7 @@ example containing most features described below: return ucwords($dummy); } + throw new \RuntimeException(sprintf('Unrecognized dummy option "%s"', $dummy)); } } From 6e6601aca98748e095066f6301b20b979902607d Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sun, 4 May 2014 21:56:01 +0200 Subject: [PATCH 05/17] [Contributing] consistent headlines --- contributing/code/bc.rst | 6 +++--- contributing/code/patches.rst | 2 +- contributing/community/releases.rst | 4 ++-- contributing/documentation/overview.rst | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contributing/code/bc.rst b/contributing/code/bc.rst index e518f94b21b..0e55eb2d18f 100644 --- a/contributing/code/bc.rst +++ b/contributing/code/bc.rst @@ -1,4 +1,4 @@ -Our Backwards Compatibility Promise +Our backwards Compatibility Promise =================================== Ensuring smooth upgrades of your projects is our first priority. That's why @@ -39,7 +39,7 @@ If you are using Symfony in your projects, the following guidelines will help you to ensure smooth upgrades to all future minor releases of your Symfony version. -Using Our Interfaces +Using our Interfaces ~~~~~~~~~~~~~~~~~~~~ All interfaces shipped with Symfony can be used in type hints. You can also call @@ -101,7 +101,7 @@ backwards compatibility promise: .. include:: _api_tagging.rst.inc -Using Our Classes +Using our Classes ~~~~~~~~~~~~~~~~~ All classes provided by Symfony may be instantiated and accessed through their diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst index 040ad643170..aa9037d2c56 100644 --- a/contributing/code/patches.rst +++ b/contributing/code/patches.rst @@ -85,7 +85,7 @@ Get the Symfony2 source code: $ cd symfony $ git remote add upstream git://github.com/symfony/symfony.git -Check that the current Tests pass +Check that the current Tests Pass ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Now that Symfony2 is installed, check that all unit tests pass for your diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst index 7875414aaca..2a7cd03539e 100644 --- a/contributing/community/releases.rst +++ b/contributing/community/releases.rst @@ -123,8 +123,8 @@ This results in very predictable dates and maintenance periods: instance), you can automatically receive an email notification if you subscribed on the `roadmap notification`_ page. -Backward Compatibility ----------------------- +Backwards Compatibility +----------------------- Our :doc:`Backwards Compatibility Promise ` is very strict and allows developers to upgrade with confidence from one minor version diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst index 1efc8e9fe15..8796557e56d 100644 --- a/contributing/documentation/overview.rst +++ b/contributing/documentation/overview.rst @@ -187,7 +187,7 @@ about in the :doc:`/contributing/community/releases` section. To keep up with the release process, the documentation team makes several changes to the documentation at various parts of the lifecycle. -When a Release reaches "end of maintenance" +When a Release Reaches "End of Maintenance" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Every release will eventually reach its "end of maintenance". For details, @@ -210,7 +210,7 @@ For this example, suppose version 2.1 has just reached its end of maintenance: *after* the end of maintenance of this branch), will have no mentions of the old version (e.g. 2.1). -When a new Branch is created for a Release +When a new Branch is Created for a Release ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ During the :ref:`stabilization phase `, a From 0586ec49e3b34601e509cb1f21cdd669a8c21e7f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sun, 4 May 2014 23:06:46 +0200 Subject: [PATCH 06/17] [Components] consistent headlines --- components/config/caching.rst | 2 +- components/config/definition.rst | 30 +++++++++---------- components/config/resources.rst | 8 ++--- components/console/events.rst | 4 +-- components/console/helpers/dialoghelper.rst | 6 ++-- components/console/introduction.rst | 2 +- components/console/single_command_tool.rst | 2 +- components/css_selector.rst | 8 ++--- components/dependency_injection/advanced.rst | 2 +- .../dependency_injection/compilation.rst | 2 +- .../dependency_injection/definitions.rst | 4 +-- .../dependency_injection/introduction.rst | 4 +-- .../dependency_injection/lazy_services.rst | 10 +++---- .../dependency_injection/parentservices.rst | 4 +-- components/dependency_injection/tags.rst | 4 +-- components/dependency_injection/workflow.rst | 6 ++-- components/event_dispatcher/introduction.rst | 2 +- components/finder.rst | 2 +- components/form/introduction.rst | 4 +-- components/form/type_guesser.rst | 2 +- .../http_foundation/session_configuration.rst | 4 +-- components/http_foundation/sessions.rst | 2 +- .../http_foundation/trusting_proxies.rst | 6 ++-- components/http_kernel/introduction.rst | 14 ++++----- components/options_resolver.rst | 6 ++-- components/routing/hostname_pattern.rst | 2 +- components/routing/introduction.rst | 2 +- components/security/authentication.rst | 6 ++-- components/security/authorization.rst | 4 +-- components/security/firewall.rst | 6 ++-- components/templating/introduction.rst | 2 +- components/using_components.rst | 2 +- components/yaml/introduction.rst | 8 ++--- 33 files changed, 86 insertions(+), 86 deletions(-) diff --git a/components/config/caching.rst b/components/config/caching.rst index e014abdff87..4bb43558c64 100644 --- a/components/config/caching.rst +++ b/components/config/caching.rst @@ -1,7 +1,7 @@ .. index:: single: Config; Caching based on resources -Caching based on resources +Caching Based on Resources ========================== When all configuration resources are loaded, you may want to process the configuration diff --git a/components/config/definition.rst b/components/config/definition.rst index f84e76351ce..93de5a22bf7 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -1,10 +1,10 @@ .. index:: single: Config; Defining and processing configuration values -Defining and processing configuration values +Defining and Processing Configuration Values ============================================ -Validating configuration values +Validating Configuration Values ------------------------------- After loading configuration values from all kinds of resources, the values @@ -38,7 +38,7 @@ they are when first encountered. Also, some keys are only available when another key has a specific value (in the sample configuration above: the ``memory`` key only makes sense when the ``driver`` is ``sqlite``). -Defining a hierarchy of configuration values using the TreeBuilder +Defining a Hierarchy of Configuration Values Using the TreeBuilder ------------------------------------------------------------------ All the rules concerning configuration values can be defined using the @@ -66,10 +66,10 @@ should be returned from a custom ``Configuration`` class which implements the } } -Adding node definitions to the tree +Adding Node Definitions to the Tree ----------------------------------- -Variable nodes +Variable Nodes ~~~~~~~~~~~~~~ A tree contains node definitions which can be laid out in a semantic way. @@ -91,7 +91,7 @@ The root node itself is an array node, and has children, like the boolean node ``auto_connect`` and the scalar node ``default_connection``. In general: after defining a node, a call to ``end()`` takes you one step up in the hierarchy. -Node type +Node Type ~~~~~~~~~ It is possible to validate the type of a provided value by using the appropriate @@ -108,7 +108,7 @@ node definition. Node type are available for: and are created with ``node($name, $type)`` or their associated shortcut ``xxxxNode($name)`` method. -Numeric node constraints +Numeric Node Constraints ~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.2 @@ -133,7 +133,7 @@ allowing to validate the value:: ->end() ; -Enum nodes +Enum Nodes ~~~~~~~~~~ .. versionadded:: 2.1 @@ -152,7 +152,7 @@ values:: This will restrict the ``gender`` option to be either ``male`` or ``female``. -Array nodes +Array Nodes ~~~~~~~~~~~ It is possible to add a deeper level to the hierarchy, by adding an array @@ -193,7 +193,7 @@ inside the current node. According to the prototype definition in the example above, it is possible to have multiple connection arrays (containing a ``driver``, ``host``, etc.). -Array node options +Array Node Options ~~~~~~~~~~~~~~~~~~ Before defining the children of an array node, you can provide options like: @@ -236,7 +236,7 @@ In XML, each ``parameters`` node would have a ``name`` attribute (along with the final array. The ``useAttributeAsKey`` is useful for normalizing how arrays are specified between different formats like XML and YAML. -Default and required values +Default and required Values --------------------------- For all node types, it is possible to define default values and replacement @@ -316,7 +316,7 @@ you can take advantage of the shortcut The ``canBeDisabled`` method looks about the same except that the section would be enabled by default. -Merging options +Merging Options --------------- Extra options concerning the merge process may be provided. For arrays: @@ -330,7 +330,7 @@ For all nodes: ``cannotBeOverwritten()`` don’t let other configuration arrays overwrite an existing value for this node -Appending sections +Appending Sections ------------------ If you have a complex configuration to validate then the tree can grow to @@ -502,7 +502,7 @@ By changing a string value into an associative array with ``name`` as the key:: ->end() ; -Validation rules +Validation Rules ---------------- More advanced validation rules can be provided using the @@ -548,7 +548,7 @@ Usually, "then" is a closure. Its return value will be used as a new value for the node, instead of the node's original value. -Processing configuration values +Processing Configuration Values ------------------------------- The :class:`Symfony\\Component\\Config\\Definition\\Processor` uses the tree diff --git a/components/config/resources.rst b/components/config/resources.rst index 15b357c3ee2..bcc47aa02e1 100644 --- a/components/config/resources.rst +++ b/components/config/resources.rst @@ -1,10 +1,10 @@ .. index:: single: Config; Loading resources -Loading resources +Loading Resources ================= -Locating resources +Locating Resources ------------------ Loading the configuration normally starts with a search for resources – in @@ -24,7 +24,7 @@ look in this directory first. The third argument indicates whether or not the locator should return the first file it has found, or an array containing all matches. -Resource loaders +Resource Loaders ---------------- For each type of resource (YAML, XML, annotation, etc.) a loader must be defined. @@ -57,7 +57,7 @@ class, which allows for recursively importing other resources:: } } -Finding the right loader +Finding the right Loader ------------------------ The :class:`Symfony\\Component\\Config\\Loader\\LoaderResolver` receives as diff --git a/components/console/events.rst b/components/console/events.rst index f1dd133d505..c15d4d68a8c 100644 --- a/components/console/events.rst +++ b/components/console/events.rst @@ -51,7 +51,7 @@ dispatched. Listeners receive a $application = $command->getApplication(); }); -The ``ConsoleEvents::TERMINATE`` event +The ``ConsoleEvents::TERMINATE`` Event -------------------------------------- **Typical Purposes**: To perform some cleanup actions after the command has @@ -89,7 +89,7 @@ Listeners receive a It is then dispatched just before the ``ConsoleEvents::EXCEPTION`` event. The exit code received in this case is the exception code. -The ``ConsoleEvents::EXCEPTION`` event +The ``ConsoleEvents::EXCEPTION`` Event -------------------------------------- **Typical Purposes**: Handle exceptions thrown during the execution of a diff --git a/components/console/helpers/dialoghelper.rst b/components/console/helpers/dialoghelper.rst index 6917d807235..da3cdb966c3 100644 --- a/components/console/helpers/dialoghelper.rst +++ b/components/console/helpers/dialoghelper.rst @@ -16,7 +16,7 @@ All the methods inside the Dialog Helper have an argument, the question as the second argument and the default value as the last argument. -Asking the User for confirmation +Asking the User for Confirmation -------------------------------- Suppose you want to confirm an action before actually executing it. Add @@ -172,7 +172,7 @@ You can also ask and validate a hidden response:: If you want to allow the response to be visible if it cannot be hidden for some reason, pass true as the fifth argument. -Let the user choose from a list of Answers +Let the User Choose from a List of Answers ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.2 @@ -244,7 +244,7 @@ this set the seventh argument to ``true``:: Now, when the user enters ``1,2``, the result will be: ``You have just selected: blue, yellow``. -Testing a Command which expects input +Testing a Command which Expects Input ------------------------------------- If you want to write a unit test for a command which expects some kind of input diff --git a/components/console/introduction.rst b/components/console/introduction.rst index cffbfabaddf..5e7e88a0d75 100644 --- a/components/console/introduction.rst +++ b/components/console/introduction.rst @@ -437,7 +437,7 @@ method:: You can also test a whole console application by using :class:`Symfony\\Component\\Console\\Tester\\ApplicationTester`. -Calling an existing Command +Calling an Existing Command --------------------------- If a command depends on another one being run before it, instead of asking the diff --git a/components/console/single_command_tool.rst b/components/console/single_command_tool.rst index 8f2dac46f2c..5082575def6 100644 --- a/components/console/single_command_tool.rst +++ b/components/console/single_command_tool.rst @@ -1,7 +1,7 @@ .. index:: single: Console; Single command application -Building a Single Command Application +Building a single Command Application ===================================== When building a command line tool, you may not need to provide several commands. diff --git a/components/css_selector.rst b/components/css_selector.rst index 4a332a73c0d..412aed84e97 100644 --- a/components/css_selector.rst +++ b/components/css_selector.rst @@ -18,8 +18,8 @@ You can install the component in 2 different ways: Usage ----- -Why use CSS selectors? -~~~~~~~~~~~~~~~~~~~~~~ +Why to Use CSS selectors? +~~~~~~~~~~~~~~~~~~~~~~~~~ When you're parsing an HTML or an XML document, by far the most powerful method is XPath. @@ -41,7 +41,7 @@ be converted to an XPath equivalent. This XPath expression can then be used with other functions and classes that use XPath to find elements in a document. -The CssSelector component +The CssSelector Component ~~~~~~~~~~~~~~~~~~~~~~~~~ The component's only goal is to convert CSS selectors to their XPath @@ -66,7 +66,7 @@ You can use this expression with, for instance, :phpclass:`DOMXPath` or uses the CssSelector component to find elements based on a CSS selector string. See the :doc:`/components/dom_crawler` for more details. -Limitations of the CssSelector component +Limitations of the CssSelector Component ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Not all CSS selectors can be converted to XPath equivalents. diff --git a/components/dependency_injection/advanced.rst b/components/dependency_injection/advanced.rst index db5fa9a04b2..77056c296ce 100644 --- a/components/dependency_injection/advanced.rst +++ b/components/dependency_injection/advanced.rst @@ -156,7 +156,7 @@ service by asking for the ``bar`` service like this:: bar: "@foo" -Requiring files +Requiring Files --------------- There might be use cases when you need to include another file just before diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst index a90110e4e65..611e40547ba 100644 --- a/components/dependency_injection/compilation.rst +++ b/components/dependency_injection/compilation.rst @@ -273,7 +273,7 @@ but also load a secondary one only if a certain parameter is set:: .. _components-dependency-injection-compiler-passes: -Prepending Configuration passed to the Extension +Prepending Configuration Passed to the Extension ------------------------------------------------ .. versionadded:: 2.2 diff --git a/components/dependency_injection/definitions.rst b/components/dependency_injection/definitions.rst index 04c96bba872..46ed34ab36a 100644 --- a/components/dependency_injection/definitions.rst +++ b/components/dependency_injection/definitions.rst @@ -33,10 +33,10 @@ it to the container using:: $container->setDefinition($id, $definition); -Working with a definition +Working with a Definition ------------------------- -Creating a new definition +Creating a new Definition ~~~~~~~~~~~~~~~~~~~~~~~~~ If you need to create a new definition rather than manipulate one retrieved diff --git a/components/dependency_injection/introduction.rst b/components/dependency_injection/introduction.rst index a07d0aef948..0d1448a1cfa 100644 --- a/components/dependency_injection/introduction.rst +++ b/components/dependency_injection/introduction.rst @@ -160,7 +160,7 @@ like this:: $newsletterManager = $container->get('newsletter_manager'); -Avoiding Your Code Becoming Dependent on the Container +Avoiding your Code Becoming Dependent on the Container ------------------------------------------------------ Whilst you can retrieve services from the container directly it is best @@ -175,7 +175,7 @@ should be as few times as possible at the entry point to your application. .. _components-dependency-injection-loading-config: -Setting Up the Container with Configuration Files +Setting up the Container with Configuration Files ------------------------------------------------- As well as setting up the services using PHP as above you can also use diff --git a/components/dependency_injection/lazy_services.rst b/components/dependency_injection/lazy_services.rst index 8f93fbcae75..342a4b35c9a 100644 --- a/components/dependency_injection/lazy_services.rst +++ b/components/dependency_injection/lazy_services.rst @@ -7,7 +7,7 @@ Lazy Services .. versionadded:: 2.3 Lazy services were added in Symfony 2.3. -Why Lazy Services? +Why lazy Services? ------------------ In some cases, you may want to inject a service that is a bit heavy to instantiate, @@ -36,13 +36,13 @@ the `ProxyManager bridge`_: If you're using the full-stack framework, the proxy manager bridge is already included but the actual proxy manager needs to be included. Therefore add - + .. code-block:: json "require": { "ocramius/proxy-manager": "0.4.*" } - + to your ``composer.json``. Afterwards compile your container and check to make sure that you get a proxy for your lazy services. @@ -79,13 +79,13 @@ the same signature of the class representing the service. You can also inject the service just like normal into other services. The object that's actually injected will be the proxy. -To check if your proxy works you can simply check the interface of the +To check if your proxy works you can simply check the interface of the received object. .. code-block:: php var_dump(class_implements($service)); - + If the class implements the ``ProxyManager\Proxy\LazyLoadingInterface`` your lazy loaded services are working. diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst index 36b0c1aa434..8b3cf6fb7e3 100644 --- a/components/dependency_injection/parentservices.rst +++ b/components/dependency_injection/parentservices.rst @@ -1,7 +1,7 @@ .. index:: single: DependencyInjection; Parent services -Managing Common Dependencies with Parent Services +Managing common Dependencies with parent Services ================================================= As you add more functionality to your application, you may well start to have @@ -299,7 +299,7 @@ would cause an exception to be raised for a non-abstract service. You can just extract common parts of similar service definitions into a parent service without also extending a parent class in PHP. -Overriding Parent Dependencies +Overriding parent Dependencies ------------------------------ There may be times where you want to override what class is passed in for diff --git a/components/dependency_injection/tags.rst b/components/dependency_injection/tags.rst index b96cce13287..67a4a730cce 100644 --- a/components/dependency_injection/tags.rst +++ b/components/dependency_injection/tags.rst @@ -64,7 +64,7 @@ Then, define the chain as a service: $container->setDefinition('acme_mailer.transport_chain', new Definition('%acme_mailer.transport_chain.class%')); -Define Services with a Custom Tag +Define Services with a custom Tag --------------------------------- Now you might want several of the ``\Swift_Transport`` classes to be instantiated @@ -172,7 +172,7 @@ run when the container is compiled:: stack framework. See :doc:`/cookbook/service_container/compiler_passes` for more details. -Adding additional attributes on Tags +Adding additional Attributes on Tags ------------------------------------ Sometimes you need additional information about each service that's tagged with your tag. diff --git a/components/dependency_injection/workflow.rst b/components/dependency_injection/workflow.rst index f869587d49d..2373ec5f4dc 100644 --- a/components/dependency_injection/workflow.rst +++ b/components/dependency_injection/workflow.rst @@ -18,8 +18,8 @@ also handles the compilation and caching. Even if you are not using HttpKernel, it should give you an idea of one way of organizing configuration in a modular application. -Working with cached Container ------------------------------ +Working with a Cached Container +------------------------------- Before building it, the kernel checks to see if a cached version of the container exists. The HttpKernel has a debug setting and if this is false, the @@ -58,7 +58,7 @@ passed to the Extension which also usually loads its own config file(s), typical with a :doc:`Configuration object ` also stored in the bundle's ``DependencyInjection`` directory. -Compiler passes to allow Interaction between Bundles +Compiler Passes to Allow Interaction between Bundles ---------------------------------------------------- :ref:`Compiler passes ` are diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst index 0ea96b89abc..d030b00cbde 100644 --- a/components/event_dispatcher/introduction.rst +++ b/components/event_dispatcher/introduction.rst @@ -243,7 +243,7 @@ Notice that this class doesn't actually *do* anything. The purpose of the events can be centralized. Notice also that a special ``FilterOrderEvent`` class will be passed to each listener of this event. -Creating an Event object +Creating an Event Object ........................ Later, when you dispatch this new event, you'll create an ``Event`` instance diff --git a/components/finder.rst b/components/finder.rst index 59e373d3768..c17f661dca8 100644 --- a/components/finder.rst +++ b/components/finder.rst @@ -295,7 +295,7 @@ it is called with the file as a :class:`Symfony\\Component\\Finder\\SplFileInfo` instance. The file is excluded from the result set if the Closure returns ``false``. -Reading contents of returned files +Reading Contents of Returned Files ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The contents of returned files can be read with diff --git a/components/form/introduction.rst b/components/form/introduction.rst index 4b99dda69fa..f65556defc9 100644 --- a/components/form/introduction.rst +++ b/components/form/introduction.rst @@ -364,7 +364,7 @@ it throughout your application. .. _component-form-intro-create-simple-form: -Creating a Simple Form +Creating a simple Form ---------------------- .. tip:: @@ -425,7 +425,7 @@ comes with a lot of :doc:`built-in types `. Now that you've built your form, learn how to :ref:`render ` it and :ref:`process the form submission `. -Setting Default Values +Setting default Values ~~~~~~~~~~~~~~~~~~~~~~ If you need your form to load with some default values (or you're building diff --git a/components/form/type_guesser.rst b/components/form/type_guesser.rst index 652f350b1ac..015bb8aeb1b 100644 --- a/components/form/type_guesser.rst +++ b/components/form/type_guesser.rst @@ -1,7 +1,7 @@ .. index:: single: Forms; Custom Type Guesser -Creating a Custom Type Guesser +Creating a custom Type Guesser ============================== The Form component can guess the type and some options of a form field by diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst index ba8dfa80fd8..ca1332cfaa1 100644 --- a/components/http_foundation/session_configuration.rst +++ b/components/http_foundation/session_configuration.rst @@ -188,7 +188,7 @@ experience, for example, by displaying a message. Symfony2 records some basic metadata about each session to give you complete freedom in this area. -Session metadata +Session Metadata ~~~~~~~~~~~~~~~~ Sessions are decorated with some basic metadata to enable fine control over the @@ -217,7 +217,7 @@ particular cookie by reading the ``getLifetime()`` method:: The expiry time of the cookie can be determined by adding the created timestamp and the lifetime. -PHP 5.4 compatibility +PHP 5.4 Compatibility ~~~~~~~~~~~~~~~~~~~~~ Since PHP 5.4.0, :phpclass:`SessionHandler` and :phpclass:`SessionHandlerInterface` diff --git a/components/http_foundation/sessions.rst b/components/http_foundation/sessions.rst index dd5ddfdba54..df9938a4ebe 100644 --- a/components/http_foundation/sessions.rst +++ b/components/http_foundation/sessions.rst @@ -225,7 +225,7 @@ has a simple API * :method:`Symfony\\Component\\HttpFoundation\\Session\\Attribute\\AttributeBagInterface::clear`: Clear the bag; -Flash messages +Flash Messages ~~~~~~~~~~~~~~ The purpose of the :class:`Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface` diff --git a/components/http_foundation/trusting_proxies.rst b/components/http_foundation/trusting_proxies.rst index f514e97835d..5ce8f888c50 100644 --- a/components/http_foundation/trusting_proxies.rst +++ b/components/http_foundation/trusting_proxies.rst @@ -24,10 +24,10 @@ your proxy. // only trust proxy headers coming from this IP addresses Request::setTrustedProxies(array('192.0.0.1', '10.0.0.0/8')); - + .. note:: - When using Symfony's internal reverse proxy (``AppCache.php``) make sure to add + When using Symfony's internal reverse proxy (``AppCache.php``) make sure to add ``127.0.0.1`` to the list of trusted proxies. @@ -49,7 +49,7 @@ can configure that header name via :method:`Symfony\\Component\\HttpFoundation\\ Request::setTrustedHeaderName(Request::HEADER_CLIENT_PORT, 'X-Proxy-Port'); Request::setTrustedHeaderName(Request::HEADER_CLIENT_PROTO, 'X-Proxy-Proto'); -Not trusting certain Headers +Not Trusting certain Headers ---------------------------- By default, if you whitelist your proxy's IP address, then all four headers diff --git a/components/http_kernel/introduction.rst b/components/http_kernel/introduction.rst index 7e40b393078..b1528695ccd 100644 --- a/components/http_kernel/introduction.rst +++ b/components/http_kernel/introduction.rst @@ -123,7 +123,7 @@ For general information on adding listeners to the events below, see .. _component-http-kernel-kernel-request: -1) The ``kernel.request`` event +1) The ``kernel.request`` Event ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Typical Purposes**: To add more information to the ``Request``, initialize @@ -261,7 +261,7 @@ will be called after another event - ``kernel.controller`` - is dispatched. .. _component-http-kernel-kernel-controller: -3) The ``kernel.controller`` event +3) The ``kernel.controller`` Event ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **Typical Purposes**: Initialize things or change the controller just before @@ -367,7 +367,7 @@ has a little bit more work to do - :ref:`kernel.view Date: Mon, 5 May 2014 18:39:44 +0200 Subject: [PATCH 07/17] fix the wording in versionadded directives --- components/debug/introduction.rst | 4 ++-- components/process.rst | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/debug/introduction.rst b/components/debug/introduction.rst index 5691ca58be4..8f3fc17102e 100644 --- a/components/debug/introduction.rst +++ b/components/debug/introduction.rst @@ -8,8 +8,8 @@ The Debug Component The Debug component provides tools to ease debugging PHP code. .. versionadded:: 2.3 - The Debug component is new to Symfony 2.3. Previously, the classes were - located in the HttpKernel component. + The Debug component was introduced in Symfony 2.3. Previously, the classes + were located in the HttpKernel component. Installation ------------ diff --git a/components/process.rst b/components/process.rst index 9c93207ff18..1170c54a479 100644 --- a/components/process.rst +++ b/components/process.rst @@ -219,7 +219,8 @@ Process Idle Timeout -------------------- .. versionadded:: 2.4 - The :method:`Symfony\\Component\\Process\\Process::setIdleTimeout` method was added in Symfony 2.4. + The :method:`Symfony\\Component\\Process\\Process::setIdleTimeout` method + was introduced in Symfony 2.4. In contrast to the timeout of the previous paragraph, the idle timeout only considers the time since the last output was produced by the process:: From a2d39a1697d7c02a868bec953ba1b458d3a0e8af Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 5 May 2014 18:32:22 +0200 Subject: [PATCH 08/17] fix the wording in versionadded directives --- book/forms.rst | 10 +++++----- book/routing.rst | 6 +++--- book/security.rst | 3 ++- book/testing.rst | 5 +++-- book/translation.rst | 2 +- components/config/definition.rst | 7 ++++--- components/console/events.rst | 2 +- components/debug.rst | 4 ++-- components/dependency_injection/compilation.rst | 3 ++- components/dependency_injection/lazy_services.rst | 2 +- components/filesystem.rst | 6 +++--- components/finder.rst | 2 +- components/http_foundation/introduction.rst | 3 ++- components/process.rst | 3 ++- components/property_access/introduction.rst | 8 ++++---- components/stopwatch.rst | 7 ++++--- components/translation/introduction.rst | 4 ++-- cookbook/console/logging.rst | 2 +- cookbook/console/sending_emails.rst | 10 +++++----- cookbook/form/dynamic_form_modification.rst | 4 ++-- cookbook/form/inherit_data_option.rst | 3 ++- cookbook/service_container/scopes.rst | 2 +- cookbook/templating/render_without_controller.rst | 2 +- reference/configuration/framework.rst | 10 +++++----- reference/constraints/CardScheme.rst | 2 +- reference/constraints/Currency.rst | 2 +- reference/constraints/EqualTo.rst | 2 +- reference/constraints/GreaterThan.rst | 2 +- reference/constraints/GreaterThanOrEqual.rst | 2 +- reference/constraints/IdenticalTo.rst | 2 +- reference/constraints/LessThan.rst | 2 +- reference/constraints/LessThanOrEqual.rst | 2 +- reference/constraints/Luhn.rst | 6 +++--- reference/constraints/NotEqualTo.rst | 2 +- reference/constraints/NotIdenticalTo.rst | 2 +- reference/dic_tags.rst | 4 ++-- reference/forms/types/options/disabled.rst.inc | 2 +- reference/forms/types/options/error_mapping.rst.inc | 2 +- reference/forms/types/options/inherit_data.rst.inc | 3 ++- reference/forms/types/options/property_path.rst.inc | 2 +- reference/twig_reference.rst | 4 ++-- 41 files changed, 81 insertions(+), 72 deletions(-) diff --git a/book/forms.rst b/book/forms.rst index 685f2b37ba8..693a6a973b0 100644 --- a/book/forms.rst +++ b/book/forms.rst @@ -232,10 +232,10 @@ controller:: } .. versionadded:: 2.3 - The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method was - added in Symfony 2.3. Previously, the ``$request`` was passed to the - ``submit`` method - a strategy which is deprecated and will be removed - in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`. + The :method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method + was introduced in Symfony 2.3. Previously, the ``$request`` was passed + to the ``submit`` method - a strategy which is deprecated and will be + removed in Symfony 3.0. For details on that method, see :ref:`cookbook-form-submit-request`. This controller follows a common pattern for handling forms, and has three possible paths: @@ -1845,7 +1845,7 @@ but here's a short example: .. versionadded:: 2.1 The ``constraints`` option, which accepts a single constraint or an array of constraints (before 2.1, the option was called ``validation_constraint``, - and only accepted a single constraint) is new to Symfony 2.1. + and only accepted a single constraint) was introduced in Symfony 2.1. .. code-block:: php diff --git a/book/routing.rst b/book/routing.rst index 6c0fef9be6a..44024702f67 100644 --- a/book/routing.rst +++ b/book/routing.rst @@ -69,8 +69,8 @@ The route is simple: return $collection; .. versionadded:: 2.2 - The ``path`` option is new in Symfony 2.2, ``pattern`` is used in older - versions. + The ``path`` option was introduced in Symfony 2.2, ``pattern`` is used + in older versions. The path defined by the ``blog_show`` route acts like ``/blog/*`` where the wildcard is given the name ``slug``. For the URL ``/blog/my-blog-post``, @@ -704,7 +704,7 @@ be accomplished with the following route configuration: return $collection; .. versionadded:: 2.2 - The ``methods`` option is added in Symfony 2.2. Use the ``_method`` + The ``methods`` option was introduced in Symfony 2.2. Use the ``_method`` requirement in older versions. Despite the fact that these two routes have identical paths (``/contact``), diff --git a/book/security.rst b/book/security.rst index 9e38f4833ea..13a06994143 100644 --- a/book/security.rst +++ b/book/security.rst @@ -1846,7 +1846,8 @@ Utilities --------- .. versionadded:: 2.2 - The ``StringUtils`` and ``SecureRandom`` classes were added in Symfony 2.2 + The ``StringUtils`` and ``SecureRandom`` classes were introduced in Symfony + 2.2 The Symfony Security component comes with a collection of nice utilities related to security. These utilities are used by Symfony, but you should also use diff --git a/book/testing.rst b/book/testing.rst index c892fb057cb..8e1484b894d 100644 --- a/book/testing.rst +++ b/book/testing.rst @@ -408,8 +408,9 @@ Accessing internal Objects ~~~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.3 - The ``getInternalRequest()`` and ``getInternalResponse()`` method were - added in Symfony 2.3. + The :method:`Symfony\\Component\\BrowserKit\\Client::getInternalRequest` + and :method:`Symfony\\Component\\BrowserKit\\Client::getInternalResponse` + methods were introduced in Symfony 2.3. If you use the client to test your application, you might want to access the client's internal objects:: diff --git a/book/translation.rst b/book/translation.rst index 1b0c340a548..b73e61d996c 100644 --- a/book/translation.rst +++ b/book/translation.rst @@ -308,7 +308,7 @@ texts* and complex expressions: template (in order to avoid side effects). .. versionadded:: 2.1 - The ``trans_default_domain`` tag is new in Symfony 2.1 + The ``trans_default_domain`` tag was introduced in Symfony 2.1. PHP Templates ~~~~~~~~~~~~~ diff --git a/components/config/definition.rst b/components/config/definition.rst index f84e76351ce..391b87b34a1 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -112,7 +112,7 @@ Numeric node constraints ~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.2 - The numeric (float and integer) nodes are new in 2.2 + The numeric (float and integer) nodes were introduced in Symfony 2.2. Numeric nodes (float and integer) provide two extra constraints - :method:`Symfony\\Component\\Config\\Definition\\Builder::min` and @@ -137,7 +137,7 @@ Enum nodes ~~~~~~~~~~ .. versionadded:: 2.1 - The enum node is new in Symfony 2.1 + The enum node was introduced in Symfony 2.1. Enum nodes provide a constraint to match the given input against a set of values:: @@ -291,7 +291,8 @@ Optional Sections ----------------- .. versionadded:: 2.2 - The ``canBeEnabled`` and ``canBeDisabled`` methods are new in Symfony 2.2 + The ``canBeEnabled`` and ``canBeDisabled`` methods were introduced in + Symfony 2.2. If you have entire sections which are optional and can be enabled/disabled, you can take advantage of the shortcut diff --git a/components/console/events.rst b/components/console/events.rst index f1dd133d505..fa69da00b5b 100644 --- a/components/console/events.rst +++ b/components/console/events.rst @@ -5,7 +5,7 @@ Using Events ============ .. versionadded:: 2.3 - Console events were added in Symfony 2.3. + Console events were introduced in Symfony 2.3. The Application class of the Console component allows you to optionally hook into the lifecycle of a console application via events. Instead of reinventing diff --git a/components/debug.rst b/components/debug.rst index 0d20a13ee9a..b3eba0dd0ba 100644 --- a/components/debug.rst +++ b/components/debug.rst @@ -8,8 +8,8 @@ The Debug Component The Debug component provides tools to ease debugging PHP code. .. versionadded:: 2.3 - The Debug component is new to Symfony 2.3. Previously, the classes were - located in the HttpKernel component. + The Debug component was introduced in Symfony 2.3. Previously, the classes + were located in the HttpKernel component. Installation ------------ diff --git a/components/dependency_injection/compilation.rst b/components/dependency_injection/compilation.rst index a90110e4e65..10486f265b6 100644 --- a/components/dependency_injection/compilation.rst +++ b/components/dependency_injection/compilation.rst @@ -277,7 +277,8 @@ Prepending Configuration passed to the Extension ------------------------------------------------ .. versionadded:: 2.2 - The ability to prepend the configuration of a bundle is new in Symfony 2.2. + The ability to prepend the configuration of a bundle was introduced in + Symfony 2.2. An Extension can prepend the configuration of any Bundle before the ``load()`` method is called by implementing :class:`Symfony\\Component\\DependencyInjection\\Extension\\PrependExtensionInterface`:: diff --git a/components/dependency_injection/lazy_services.rst b/components/dependency_injection/lazy_services.rst index 8f93fbcae75..82a8ce194e1 100644 --- a/components/dependency_injection/lazy_services.rst +++ b/components/dependency_injection/lazy_services.rst @@ -5,7 +5,7 @@ Lazy Services ============= .. versionadded:: 2.3 - Lazy services were added in Symfony 2.3. + Lazy services were introduced in Symfony 2.3. Why Lazy Services? ------------------ diff --git a/components/filesystem.rst b/components/filesystem.rst index ab92e083d54..96dd7c2ba9b 100644 --- a/components/filesystem.rst +++ b/components/filesystem.rst @@ -7,8 +7,8 @@ The Filesystem Component The Filesystem component provides basic utilities for the filesystem. .. versionadded:: 2.1 - The Filesystem component is new to Symfony 2.1. Previously, the ``Filesystem`` - class was located in the HttpKernel component. + The Filesystem component was introduced in Symfony 2.1. Previously, the + ``Filesystem`` class was located in the HttpKernel component. Installation ------------ @@ -237,7 +237,7 @@ dumpFile ~~~~~~~~ .. versionadded:: 2.3 - ``dumpFile`` is new in Symfony 2.3. + The ``dumpFile()`` was introduced in Symfony 2.3. :method:`Symfony\\Component\\Filesystem\\Filesystem::dumpFile` allows you to dump contents to a file. It does this in an atomic manner: it writes a temporary diff --git a/components/finder.rst b/components/finder.rst index 59e373d3768..5131ea94375 100644 --- a/components/finder.rst +++ b/components/finder.rst @@ -207,7 +207,7 @@ Path ~~~~ .. versionadded:: 2.2 - The ``path()`` and ``notPath()`` methods were added in version 2.2. + The ``path()`` and ``notPath()`` methods were introduced in Symfony 2.2. Restrict files and directories by path with the :method:`Symfony\\Component\\Finder\\Finder::path` method:: diff --git a/components/http_foundation/introduction.rst b/components/http_foundation/introduction.rst index 5c2bfc0f78d..b44be7d9d9a 100644 --- a/components/http_foundation/introduction.rst +++ b/components/http_foundation/introduction.rst @@ -251,7 +251,8 @@ by using the following methods: returns the list of accepted charsets ordered by descending quality. .. versionadded:: 2.2 - The :class:`Symfony\\Component\\HttpFoundation\\AcceptHeader` class is new in Symfony 2.2. + The :class:`Symfony\\Component\\HttpFoundation\\AcceptHeader` class was + introduced in Symfony 2.2. If you need to get full access to parsed data from ``Accept``, ``Accept-Language``, ``Accept-Charset`` or ``Accept-Encoding``, you can use diff --git a/components/process.rst b/components/process.rst index 70afa1c7f2d..3acc2c55137 100644 --- a/components/process.rst +++ b/components/process.rst @@ -37,7 +37,8 @@ The component takes care of the subtle differences between the different platfor when executing the command. .. versionadded:: 2.2 - The ``getIncrementalOutput()`` and ``getIncrementalErrorOutput()`` methods were added in Symfony 2.2. + The ``getIncrementalOutput()`` and ``getIncrementalErrorOutput()`` methods + were introduced in Symfony 2.2. The ``getOutput()`` method always return the whole content of the standard output of the command and ``getErrorOutput()`` the content of the error diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst index 37573f2567b..a9eb4083fd9 100644 --- a/components/property_access/introduction.rst +++ b/components/property_access/introduction.rst @@ -9,8 +9,8 @@ The PropertyAccess Component object or array using a simple string notation. .. versionadded:: 2.2 - The PropertyAccess component is new to Symfony 2.2. Previously, the - ``PropertyPath`` class was located in the Form component. + The PropertyAccess component was introduced in Symfony 2.2. Previously, + the ``PropertyPath`` class was located in the Form component. Installation ------------ @@ -34,8 +34,8 @@ default configuration:: $accessor = PropertyAccess::createPropertyAccessor(); .. versionadded:: 2.3 - Before Symfony 2.3, the :method:`Symfony\\Component\\PropertyAccess\\PropertyAccess::createPropertyAccessor` - was called ``getPropertyAccessor()``. + The :method:`Symfony\\Component\\PropertyAccess\\PropertyAccess::createPropertyAccessor` + method was introduced in Symfony 2.3. Previously, it was called ``getPropertyAccessor()``. Reading from Arrays ------------------- diff --git a/components/stopwatch.rst b/components/stopwatch.rst index e8494a75d35..e2561614204 100644 --- a/components/stopwatch.rst +++ b/components/stopwatch.rst @@ -8,8 +8,9 @@ The Stopwatch Component Stopwatch component provides a way to profile code. .. versionadded:: 2.2 - The Stopwatch component is new to Symfony 2.2. Previously, the ``Stopwatch`` - class was located in the HttpKernel component (and was new in 2.1). + The Stopwatch component was introduced in Symfony 2.2. Previously, the + ``Stopwatch`` class was located in the HttpKernel component (and was introduced + in Symfony 2.1). Installation ------------ @@ -36,7 +37,7 @@ microtime by yourself. Instead, use the simple $event = $stopwatch->stop('eventName'); The :class:`Symfony\\Component\\Stopwatch\\StopwatchEvent` object can be retrieved -from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`, +from the :method:`Symfony\\Component\\Stopwatch\\Stopwatch::start`, :method:`Symfony\\Component\\Stopwatch\\Stopwatch::stop` and :method:`Symfony\\Component\\Stopwatch\\Stopwatch::lap` methods. diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst index ca1df51756b..963ba671ff3 100644 --- a/components/translation/introduction.rst +++ b/components/translation/introduction.rst @@ -90,8 +90,8 @@ Loader too. The default loaders are: .. versionadded:: 2.1 The ``IcuDatFileLoader``, ``IcuResFileLoader``, ``IniFileLoader``, - ``MofileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were added in - Symfony 2.1 + ``MofileLoader``, ``PoFileLoader`` and ``QtFileLoader`` were introduced + in Symfony 2.1. All file loaders require the :doc:`Config component `. diff --git a/cookbook/console/logging.rst b/cookbook/console/logging.rst index 21bd1162777..6f34a75048d 100644 --- a/cookbook/console/logging.rst +++ b/cookbook/console/logging.rst @@ -73,7 +73,7 @@ To get your console application to automatically log uncaught exceptions for all of your commands, you can use :doc:`console events`. .. versionadded:: 2.3 - Console events were added in Symfony 2.3. + Console events were introduced in Symfony 2.3. First configure a listener for console exception events in the service container: diff --git a/cookbook/console/sending_emails.rst b/cookbook/console/sending_emails.rst index ccc1d1947d5..b5f1ba41cb2 100644 --- a/cookbook/console/sending_emails.rst +++ b/cookbook/console/sending_emails.rst @@ -21,7 +21,7 @@ Configuring the Request Context globally ---------------------------------------- .. versionadded: 2.2 - The ``base_url`` parameter is available since Symfony 2.2 + The ``base_url`` parameter was introduced in Symfony 2.2. To configure the Request Context - which is used by the URL Generator - you can redefine the parameters it uses as default values to change the default host @@ -98,14 +98,14 @@ the queue yourself. Use the following code to send emails inside your console command:: $message = new \Swift_Message(); - + // ... prepare the message - + $container = $this->getContainer(); $mailer = $container->get('mailer'); - + $mailer->send($message); - + // now manually flush the queue $spool = $mailer->getTransport()->getSpool(); $transport = $container->get('swiftmailer.transport.real'); diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst index 51330f9dfb8..f0290bded63 100644 --- a/cookbook/form/dynamic_form_modification.rst +++ b/cookbook/form/dynamic_form_modification.rst @@ -533,8 +533,8 @@ On a form, we can usually listen to the following events: * ``POST_SUBMIT`` .. versionadded:: 2.3 - The events ``PRE_SUBMIT``, ``SUBMIT`` and ``POST_SUBMIT`` were added in - Symfony 2.3. Before, they were named ``PRE_BIND``, ``BIND`` and ``POST_BIND``. + The events ``PRE_SUBMIT``, ``SUBMIT`` and ``POST_SUBMIT`` were introduced + in Symfony 2.3. Before, they were named ``PRE_BIND``, ``BIND`` and ``POST_BIND``. .. versionadded:: 2.2.6 The behavior of the ``POST_SUBMIT`` event changed slightly in 2.2.6, which the diff --git a/cookbook/form/inherit_data_option.rst b/cookbook/form/inherit_data_option.rst index 92efc82be10..ee46305be2b 100644 --- a/cookbook/form/inherit_data_option.rst +++ b/cookbook/form/inherit_data_option.rst @@ -5,7 +5,8 @@ How to Reduce Code Duplication with "inherit_data" ================================================== .. versionadded:: 2.3 - This ``inherit_data`` option was known as ``virtual`` before Symfony 2.3. + This ``inherit_data`` option was introduced in Symfony 2.3. Before, it + was known as ``virtual``. The ``inherit_data`` form field option can be very useful when you have some duplicated fields in different entities. For example, imagine you have two diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst index 2d6f8e7065a..bcbdb188fc6 100644 --- a/cookbook/service_container/scopes.rst +++ b/cookbook/service_container/scopes.rst @@ -99,7 +99,7 @@ Using a synchronized Service ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.3 - Synchronized services are new in Symfony 2.3. + Synchronized services were introduced in Symfony 2.3. Injecting the container or setting your service to a narrower scope have drawbacks. For synchronized services (like the ``request``), using setter diff --git a/cookbook/templating/render_without_controller.rst b/cookbook/templating/render_without_controller.rst index 72cbdacc563..cfd96b61c7b 100644 --- a/cookbook/templating/render_without_controller.rst +++ b/cookbook/templating/render_without_controller.rst @@ -79,7 +79,7 @@ Caching the static Template .. versionadded:: 2.2 The ability to cache templates rendered via ``FrameworkBundle:Template:template`` - is new in Symfony 2.2. + was introduced in Symfony 2.2. Since templates that are rendered in this way are typically static, it might make sense to cache them. Fortunately, this is easy! By configuring a few diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index d0181c56408..9c36b3e1c94 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -62,7 +62,7 @@ http_method_override ~~~~~~~~~~~~~~~~~~~~ .. versionadded:: 2.3 - The ``http_method_override`` option is new in Symfony 2.3. + The ``http_method_override`` option was introduced in Symfony 2.3. **type**: ``Boolean`` **default**: ``true`` @@ -422,10 +422,10 @@ enabled The profiler can be disabled by setting this key to ``false``. .. versionadded:: 2.3 - - The ``collect`` option is new in Symfony 2.3. Previously, when ``profiler.enabled`` - was false, the profiler *was* actually enabled, but the collectors were - disabled. Now the profiler and collectors can be controller independently. + The ``collect`` option was introduced in Symfony 2.3. Previously, when + ``profiler.enabled`` was ``false``, the profiler *was* actually enabled, + but the collectors were disabled. Now, the profiler and the collectors + can be controlled independently. collect ....... diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst index c163dd1f2e3..f8d706e665a 100644 --- a/reference/constraints/CardScheme.rst +++ b/reference/constraints/CardScheme.rst @@ -2,7 +2,7 @@ CardScheme ========== .. versionadded:: 2.2 - The CardScheme validation is new in Symfony 2.2. + The ``CardScheme`` constraint was introduced in Symfony 2.2. This constraint ensures that a credit card number is valid for a given credit card company. It can be used to validate the number before trying to initiate a payment diff --git a/reference/constraints/Currency.rst b/reference/constraints/Currency.rst index 3a2a3b1b8cf..22709f469ba 100644 --- a/reference/constraints/Currency.rst +++ b/reference/constraints/Currency.rst @@ -2,7 +2,7 @@ Currency ======== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``Currency`` constraint was introduced in Symfony 2.3. Validates that a value is a valid `3-letter ISO 4217`_ currency name. diff --git a/reference/constraints/EqualTo.rst b/reference/constraints/EqualTo.rst index c8e36b2be4a..1079bd90430 100644 --- a/reference/constraints/EqualTo.rst +++ b/reference/constraints/EqualTo.rst @@ -2,7 +2,7 @@ EqualTo ======= .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``EqualTo`` constraint was introduced in Symfony 2.3. Validates that a value is equal to another value, defined in the options. To force that a value is *not* equal, see :doc:`/reference/constraints/NotEqualTo`. diff --git a/reference/constraints/GreaterThan.rst b/reference/constraints/GreaterThan.rst index a266a6c97cc..80439900b26 100644 --- a/reference/constraints/GreaterThan.rst +++ b/reference/constraints/GreaterThan.rst @@ -2,7 +2,7 @@ GreaterThan =========== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``GreaterThan`` constraint was introduced in Symfony 2.3. Validates that a value is greater than another value, defined in the options. To force that a value is greater than or equal to another value, see diff --git a/reference/constraints/GreaterThanOrEqual.rst b/reference/constraints/GreaterThanOrEqual.rst index 383c572d3a8..0dfe7072dc6 100644 --- a/reference/constraints/GreaterThanOrEqual.rst +++ b/reference/constraints/GreaterThanOrEqual.rst @@ -2,7 +2,7 @@ GreaterThanOrEqual ================== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``GreaterThanOrEqual`` constraint was introduced in Symfony 2.3. Validates that a value is greater than or equal to another value, defined in the options. To force that a value is greater than another value, see diff --git a/reference/constraints/IdenticalTo.rst b/reference/constraints/IdenticalTo.rst index 44ba134dcd1..ea010607dd9 100644 --- a/reference/constraints/IdenticalTo.rst +++ b/reference/constraints/IdenticalTo.rst @@ -2,7 +2,7 @@ IdenticalTo =========== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``IdenticalTo`` constraint was introduced in Symfony 2.3. Validates that a value is identical to another value, defined in the options. To force that a value is *not* identical, see diff --git a/reference/constraints/LessThan.rst b/reference/constraints/LessThan.rst index 2ae57eee0a7..849b157bc0a 100644 --- a/reference/constraints/LessThan.rst +++ b/reference/constraints/LessThan.rst @@ -2,7 +2,7 @@ LessThan ======== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``LessThan`` constraint was introduced in Symfony 2.3. Validates that a value is less than another value, defined in the options. To force that a value is less than or equal to another value, see diff --git a/reference/constraints/LessThanOrEqual.rst b/reference/constraints/LessThanOrEqual.rst index e1b56e32e05..d706ac20693 100644 --- a/reference/constraints/LessThanOrEqual.rst +++ b/reference/constraints/LessThanOrEqual.rst @@ -2,7 +2,7 @@ LessThanOrEqual =============== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``LessThanOrEqual`` constraint was introduced in Symfony 2.3. Validates that a value is less than or equal to another value, defined in the options. To force that a value is less than another value, see diff --git a/reference/constraints/Luhn.rst b/reference/constraints/Luhn.rst index 07bd8bd2dda..cdb55c7f156 100644 --- a/reference/constraints/Luhn.rst +++ b/reference/constraints/Luhn.rst @@ -2,7 +2,7 @@ Luhn ==== .. versionadded:: 2.2 - The Luhn validation is new in Symfony 2.2. + The ``Luhn`` constraint was introduced in Symfony 2.2. This constraint is used to ensure that a credit card number passes the `Luhn algorithm`_. It is useful as a first step to validating a credit card: before communicating with a @@ -39,7 +39,7 @@ will contain a credit card number. // src/Acme/SubscriptionBundle/Entity/Transaction.php namespace Acme\SubscriptionBundle\Entity\Transaction; - + use Symfony\Component\Validator\Constraints as Assert; class Transaction @@ -71,7 +71,7 @@ will contain a credit card number. // src/Acme/SubscriptionBundle/Entity/Transaction.php namespace Acme\SubscriptionBundle\Entity\Transaction; - + use Symfony\Component\Validator\Mapping\ClassMetadata; use Symfony\Component\Validator\Constraints as Assert; diff --git a/reference/constraints/NotEqualTo.rst b/reference/constraints/NotEqualTo.rst index 6805a425599..0e2e9f7593d 100644 --- a/reference/constraints/NotEqualTo.rst +++ b/reference/constraints/NotEqualTo.rst @@ -2,7 +2,7 @@ NotEqualTo ========== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``NotEqualTo`` constraint was introduced in Symfony 2.3. Validates that a value is **not** equal to another value, defined in the options. To force that a value is equal, see diff --git a/reference/constraints/NotIdenticalTo.rst b/reference/constraints/NotIdenticalTo.rst index d83ef989ae6..9a70d41c571 100644 --- a/reference/constraints/NotIdenticalTo.rst +++ b/reference/constraints/NotIdenticalTo.rst @@ -2,7 +2,7 @@ NotIdenticalTo ============== .. versionadded:: 2.3 - This constraint is new in version 2.3. + The ``NotIdenticalTo`` constraint was introduced in Symfony 2.3. Validates that a value is **not** identical to another value, defined in the options. To force that a value is identical, see diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index e39e2dedb77..0fbed08d7d8 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -991,7 +991,7 @@ translation.extractor **Purpose**: To register a custom service that extracts messages from a file .. versionadded:: 2.1 - The ability to add message extractors is new in Symfony 2.1. + The ability to add message extractors was introduced in Symfony 2.1. When executing the ``translation:update`` command, it uses extractors to extract translation messages from a file. By default, the Symfony2 framework @@ -1062,7 +1062,7 @@ translation.dumper **Purpose**: To register a custom service that dumps messages to a file .. versionadded:: 2.1 - The ability to add message dumpers is new in Symfony 2.1. + The ability to add message dumpers was introduced in Symfony 2.1. After an `Extractor `_ has extracted all messages from the templates, the dumpers are executed to dump the messages to a translation diff --git a/reference/forms/types/options/disabled.rst.inc b/reference/forms/types/options/disabled.rst.inc index 89e8177a6e3..50d100a1f37 100644 --- a/reference/forms/types/options/disabled.rst.inc +++ b/reference/forms/types/options/disabled.rst.inc @@ -2,7 +2,7 @@ disabled ~~~~~~~~ .. versionadded:: 2.1 - The ``disabled`` option is new in version 2.1 + The ``disabled`` option was introduced in Symfony 2.1. **type**: ``boolean`` **default**: ``false`` diff --git a/reference/forms/types/options/error_mapping.rst.inc b/reference/forms/types/options/error_mapping.rst.inc index e2af2edebad..115d446d9b5 100644 --- a/reference/forms/types/options/error_mapping.rst.inc +++ b/reference/forms/types/options/error_mapping.rst.inc @@ -4,7 +4,7 @@ error_mapping **type**: ``array`` **default**: ``empty`` .. versionadded:: 2.1 - The ``error_mapping`` option is new to Symfony 2.1. + The ``error_mapping`` option was introduced in Symfony 2.1. This option allows you to modify the target of a validation error. diff --git a/reference/forms/types/options/inherit_data.rst.inc b/reference/forms/types/options/inherit_data.rst.inc index 5537c1aa51c..3b789db9f25 100644 --- a/reference/forms/types/options/inherit_data.rst.inc +++ b/reference/forms/types/options/inherit_data.rst.inc @@ -2,7 +2,8 @@ inherit_data ~~~~~~~~~~~~ .. versionadded:: 2.3 - This option was known as ``virtual`` before Symfony 2.3. + The ``inherit_data`` option was introduced in Symfony 2.3. Before, it + was known as ``virtual``. **type**: ``boolean`` **default**: ``false`` diff --git a/reference/forms/types/options/property_path.rst.inc b/reference/forms/types/options/property_path.rst.inc index 797ea2a5784..e6661fcfeea 100644 --- a/reference/forms/types/options/property_path.rst.inc +++ b/reference/forms/types/options/property_path.rst.inc @@ -16,4 +16,4 @@ you can set the ``property_path`` option to ``false``, but using ``mapped`` option. .. versionadded:: 2.1 - Since 2.1, the ``mapped`` option has been added for this use-case. + The ``mapped`` option was introduced in Symfony 2.1 for this use-case. diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst index 7fb080bddc4..6a237ca4b15 100644 --- a/reference/twig_reference.rst +++ b/reference/twig_reference.rst @@ -18,8 +18,8 @@ Functions --------- .. versionadded:: 2.2 - The ``render`` and ``controller`` functions are new in Symfony 2.2. Prior, - the ``{% render %}`` tag was used and had a different signature. + The ``render`` and ``controller`` functions were introduced in Symfony + 2.2. Prior, the ``{% render %}`` tag was used and had a different signature. +----------------------------------------------------+--------------------------------------------------------------------------------------------+ | Function Syntax | Usage | From 648789213e4f962d159d41760d25a5d86d99a571 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Tue, 6 May 2014 16:36:09 +0200 Subject: [PATCH 09/17] Added April changelog --- changelog.rst | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/changelog.rst b/changelog.rst index 214761e8e74..8980ef60a7f 100644 --- a/changelog.rst +++ b/changelog.rst @@ -215,3 +215,51 @@ Minor Documentation Changes - `664a0be `_ #3633 Added missing PHP syntax coloration (DerekRoth) - `1714a31 `_ #3585 Use consistent method chaining in BlogBundle sample application (ockcyp) - `cb61f4f `_ #3581 Add missing hyphen in HTTP Fundamentals page (ockcyp) + + +April, 2014 +----------- + +New Documentation +~~~~~~~~~~~~~~~~~ + +- `322972e `_ #3803 [Book][Validation] configuration examples for the GroupSequenceProvider (xabbuh) +- `d4ca16a `_ #3743 Improve examples in parent services (WouterJ) +- `d611e77 `_ #3701 [Serializer] add documentation for serializer callbacks (cordoval) +- `80c645c `_ #3719 Fixed event listeners priority (tony-co) + +Fixed Documentation +~~~~~~~~~~~~~~~~~~~ + +- `f801e2e `_ #3805 Add missing autocomplete argument in askAndValidate method (ifdattic) +- `a81d367 `_ #3786 replaceArguments should be setArguments (RobinvdVleuten) +- `33b64e1 `_ #3788 Fix link for StopwatchEvent class (rpg600) +- `529d4ce `_ #3761 buildViewBottomUp has been renamed to finishView (Nyholm) +- `d743139 `_ #3768 the Locale component does not have elements tagged with @api (xabbuh) +- `2b8e44d `_ #3747 Fix Image constraint class and validator link (weaverryan) +- `fa362ca `_ #3741 correct RuntimeException reference (shieldo) +- `d92545e `_ #3734 [book] [testing] fixed the path of the phpunit.xml file (javiereguiluz) + +Minor Documentation Changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- `1094a13 `_ #3807 Added some exceptions to the method order in CS (stof) +- `55442b5 `_ #3800 Fixed another blockquote rendering issue (WouterJ) +- `969fd71 `_ #3785 ensure that destination directories don't exist before creating them (xabbuh) +- `79322ff `_ #3799 Fix list to not render in a block quote (WouterJ) +- `1a6f730 `_ #3793 language tweak for the tip introduced in #3743 (xabbuh) +- `dda9e88 `_ #3778 Adding information on internal reverse proxy (tcz) +- `d36bbd9 `_ #3765 [WIP] make headlines consistent with our standards (xabbuh) +- `daa81a0 `_ #3766 [Book] add note about services and the service container in the form cha... (xabbuh) +- `4529858 `_ #3767 [Book] link to the bc promise in the stable API description (xabbuh) +- `a5471b3 `_ #3775 Fixed variable naming (peterrehm) +- `703c2a6 `_ #3772 [Cookbook][Sessions] some language improvements (xabbuh) +- `3d30b56 `_ #3773 modify Symfony CMF configuration values in the build process so that the... (xabbuh) +- `cfd6d7c `_ #3758 [Book][Routing] Fixed typo on PHP version of a route definition (saro0h) +- `6bd134c `_ #3754 ignore more files and directories which are created when building the documentation (xabbuh) +- `54d6a9e `_ #3736 [book] Misc. routing fixes (javiereguiluz) +- `f149dcf `_ #3739 [book] [forms] misc. fixes and tweaks (javiereguiluz) +- `ce582ec `_ #3735 [book] [controller] fixed the code of a session sample code (javiereguiluz) +- `499ba5c `_ #3733 [book] [validation] fixed typos (javiereguiluz) +- `4d0ff8f `_ #3732 Update routing.rst. Explain using url() v. path(). (ackerman) +- `44c6273 `_ #3727 Added a note about inlined private services (javiereguiluz) \ No newline at end of file From 53df287b98ebe4cb9cd42e90ef534c27c315bc2b Mon Sep 17 00:00:00 2001 From: WouterJ Date: Tue, 6 May 2014 16:37:29 +0200 Subject: [PATCH 10/17] [#3797] Reordered changelog --- changelog.rst | 267 +++++++++++++++++++++++++------------------------- 1 file changed, 132 insertions(+), 135 deletions(-) diff --git a/changelog.rst b/changelog.rst index 8980ef60a7f..ca4723a032d 100644 --- a/changelog.rst +++ b/changelog.rst @@ -13,119 +13,52 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. -January, 2014 -------------- - -New Documentation -~~~~~~~~~~~~~~~~~ - -No changes - -Fixed Documentation -~~~~~~~~~~~~~~~~~~~ - -- `e385d28 `_ #3503 file extension correction xfliff to xliff (nixilla) -- `7fe0de3 `_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka) -- `8155e4c `_ #3473 Update proxy_examples.rst (AZielinski) -- `c205bc6 `_ #3468 enclose YAML string with double quotes to fix syntax highlighting (xabbuh) -- `89963cc `_ #3463 Fix typos in cookbook/testing/database (ifdattic) -- `e0a52ec `_ #3460 remove confusing outdated note on interactive rebasing (xabbuh) -- `6831b13 `_ #3455 [Contributing][Code] fix indentation so that the text is rendered properly (xabbuh) -- `ea5816f `_ #3433 [WIP][Reference][Form Types] Update "radio" form type (bicpi) -- `42c80d1 `_ #3448 Overridden tweak (weaverryan) -- `d9d7c58 `_ #3444 Fix issue #3442 (ifdattic) -- `9e2e64b `_ #3427 Removed code references to Symfony Standard Distribution (danielcsgomes) -- `26b8146 `_ #3415 [#3334] the data_class option was not introduced in 2.4 (xabbuh) -- `0b2a491 `_ #3414 add missing code-block directive (xabbuh) -- `4988118 `_ #3432 [Reference][Form Types] Add "max_length" option in form type (nykopol) -- `26a7b1b `_ #3423 [Session Configuration] add clarifying notes on session save handler proxies (cordoval) - -Minor Documentation Changes -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -- `1131247 `_ #3508 Add 'in XML' for additional clarity (ifdattic) -- `a650b93 `_ #3506 Nykopol overriden options (weaverryan) -- `ab10035 `_ #3505 replace Akamaï with Akamai (xabbuh) -- `7f56c20 `_ #3501 [Security] Fix markup (tyx) -- `80a90ba `_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic) -- `e5bc4ea `_ #3498 Remove second empty data (xabbuh) -- `d084d87 `_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi) -- `3250aba `_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic) -- `f285d93 `_ #3451 some language tweaks (AE, third-person perspective) (xabbuh) -- `2b7e0f6 `_ #3497 Fix highlighting (WouterJ) -- `a535ae0 `_ #3471 Fixed `````versionadded````` inconsistencies in Symfony 2.3 (danielcsgomes) -- `f077a8e `_ #3465 change wording in versionadded example to be consistent with what we use... (xabbuh) -- `f9f7548 `_ #3462 Replace ... with etc (ifdattic) -- `65efcc4 `_ #3445 [Reference][Form Types] Add missing (but existing) options to "form" type (bicpi) -- `1d1b91d `_ #3431 [Config] add cautionary note on ini file loader limitation (cordoval) -- `f2eaf9b `_ #3419 doctrine file upload example uses dir -- caution added (cordoval) -- `72b53ad `_ #3404 [#3276] Trying to further clarify the session storage directory details (weaverryan) -- `67b7bbd `_ #3413 [Cookbook][Bundles] improve explanation of code block for bundle removal (cordoval) -- `7c5a914 `_ #3369 Indicate that Group Sequence Providers can use YAML (karptonite) -- `1e0311e `_ #3416 add empty_data option where required option is used (xabbuh) -- `2be3f52 `_ #3422 [Cookbook][Custom Authentication Provider] add a note of warning for when forbidding anonymous users (cordoval) - - -February, 2014 --------------- +April, 2014 +----------- New Documentation ~~~~~~~~~~~~~~~~~ -- `9dcf467 `_ #3613 Javiereguiluz revamped quick tour (weaverryan) -- `89c6f1d `_ #3439 [Review] Added detailed Backwards Compatibility Promise text (webmozart) -- `0029408 `_ #3558 Created Documentation CHANGELOG (WouterJ) -- `f6dd678 `_ #3548 Update forms.rst (atmosf3ar) -- `527c8b6 `_ #3496 Added a section about using named assets (vmattila) +- `322972e `_ #3803 [Book][Validation] configuration examples for the GroupSequenceProvider (xabbuh) +- `d4ca16a `_ #3743 Improve examples in parent services (WouterJ) +- `d611e77 `_ #3701 [Serializer] add documentation for serializer callbacks (cordoval) +- `80c645c `_ #3719 Fixed event listeners priority (tony-co) Fixed Documentation ~~~~~~~~~~~~~~~~~~~ -- `5c367b4 `_ #3517 Fixed OptionsResolver component docs (WouterJ) -- `adcbb5d `_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut) -- `a21fb26 `_ #3559 Remove reference to copying parameters.yml from Git cookbook (pwaring) -- `de71a51 `_ #3551 [Cookbook][Dynamic Form Modification] Fix sample code (rybakit) -- `143db2f `_ #3550 Update introduction.rst (taavit) -- `384538b `_ #3549 Fixed createPropertyAccessorBuilder usage (antonbabenko) -- `d275302 `_ #3541 Update generic_event.rst (Lumbendil) -- `819949c `_ #3537 Add missing variable assignment (colinodell) -- `d7e8262 `_ #3535 fix form type name. (yositani2002) -- `821af3b `_ #3493 Type fix in remove.rst (weaverryan) -- `003230f `_ #3530 Update form_customization.rst (dczech) -- `696313c `_ #3513 [Component-DI] Fixed typo (saro0h) -- `27dcebd `_ #3509 Fix typo: side.bar.twig => sidebar.twig (ifdattic) -- `e385d28 `_ #3503 file extension correction xfliff to xliff (nixilla) -- `7fe0de3 `_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka) -- `8155e4c `_ #3473 Update proxy_examples.rst (AZielinski) +- `f801e2e `_ #3805 Add missing autocomplete argument in askAndValidate method (ifdattic) +- `a81d367 `_ #3786 replaceArguments should be setArguments (RobinvdVleuten) +- `33b64e1 `_ #3788 Fix link for StopwatchEvent class (rpg600) +- `529d4ce `_ #3761 buildViewBottomUp has been renamed to finishView (Nyholm) +- `d743139 `_ #3768 the Locale component does not have elements tagged with @api (xabbuh) +- `2b8e44d `_ #3747 Fix Image constraint class and validator link (weaverryan) +- `fa362ca `_ #3741 correct RuntimeException reference (shieldo) +- `d92545e `_ #3734 [book] [testing] fixed the path of the phpunit.xml file (javiereguiluz) Minor Documentation Changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- `0928249 `_ #3568 Update checkbox_compound.rst.inc (joshuaadickerson) -- `38def3b `_ #3567 Update checkbox_compound.rst.inc (joshuaadickerson) -- `15d8ab8 `_ #3553 Minimize horizontal scrolling in code blocks to improve readability (ifdattic) -- `5120863 `_ #3547 Update acl.rst (iqfoundry) -- `d974c77 `_ #3556 Fix PSR error (ifdattic) -- `f4bb017 `_ #3555 Wrap variables in {} for safer interpolation (ifdattic) -- `5f02bca `_ #3552 Fix typos (ifdattic) -- `6e32c47 `_ #3546 Fix README: contributions should be based off 2.3 or higher (colinodell) -- `ffa8f76 `_ #3545 Example of getting entity managers directly from the container (colinodell) -- `6a2a55b `_ #3579 Fix build errors (xabbuh) -- `73adf8b `_ #3528 Clarify service parameters usages (WouterJ) -- `9ba4fa7 `_ #3527 Changes to components domcrawler (ifdattic) -- `8973c81 `_ #3526 Changes for Console component (ifdattic) -- `6848bed `_ #3538 Rebasing #3518 (weaverryan) -- `c838df8 `_ #3511 [Component-DI] Removed useless else statement in code example (saro0h) -- `1af6742 `_ #3510 add empty line (lazyants) -- `1131247 `_ #3508 Add 'in XML' for additional clarity (ifdattic) -- `a650b93 `_ #3506 Nykopol overriden options (weaverryan) -- `ab10035 `_ #3505 replace Akamaï with Akamai (xabbuh) -- `7f56c20 `_ #3501 [Security] Fix markup (tyx) -- `80a90ba `_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic) -- `e5bc4ea `_ #3498 Remove second empty data (xabbuh) -- `d084d87 `_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi) -- `3250aba `_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic) - +- `1094a13 `_ #3807 Added some exceptions to the method order in CS (stof) +- `55442b5 `_ #3800 Fixed another blockquote rendering issue (WouterJ) +- `969fd71 `_ #3785 ensure that destination directories don't exist before creating them (xabbuh) +- `79322ff `_ #3799 Fix list to not render in a block quote (WouterJ) +- `1a6f730 `_ #3793 language tweak for the tip introduced in #3743 (xabbuh) +- `dda9e88 `_ #3778 Adding information on internal reverse proxy (tcz) +- `d36bbd9 `_ #3765 [WIP] make headlines consistent with our standards (xabbuh) +- `daa81a0 `_ #3766 [Book] add note about services and the service container in the form cha... (xabbuh) +- `4529858 `_ #3767 [Book] link to the bc promise in the stable API description (xabbuh) +- `a5471b3 `_ #3775 Fixed variable naming (peterrehm) +- `703c2a6 `_ #3772 [Cookbook][Sessions] some language improvements (xabbuh) +- `3d30b56 `_ #3773 modify Symfony CMF configuration values in the build process so that the... (xabbuh) +- `cfd6d7c `_ #3758 [Book][Routing] Fixed typo on PHP version of a route definition (saro0h) +- `6bd134c `_ #3754 ignore more files and directories which are created when building the documentation (xabbuh) +- `54d6a9e `_ #3736 [book] Misc. routing fixes (javiereguiluz) +- `f149dcf `_ #3739 [book] [forms] misc. fixes and tweaks (javiereguiluz) +- `ce582ec `_ #3735 [book] [controller] fixed the code of a session sample code (javiereguiluz) +- `499ba5c `_ #3733 [book] [validation] fixed typos (javiereguiluz) +- `4d0ff8f `_ #3732 Update routing.rst. Explain using url() v. path(). (ackerman) +- `44c6273 `_ #3727 Added a note about inlined private services (javiereguiluz) March, 2014 ----------- @@ -216,50 +149,114 @@ Minor Documentation Changes - `1714a31 `_ #3585 Use consistent method chaining in BlogBundle sample application (ockcyp) - `cb61f4f `_ #3581 Add missing hyphen in HTTP Fundamentals page (ockcyp) +February, 2014 +-------------- -April, 2014 ------------ +New Documentation +~~~~~~~~~~~~~~~~~ + +- `9dcf467 `_ #3613 Javiereguiluz revamped quick tour (weaverryan) +- `89c6f1d `_ #3439 [Review] Added detailed Backwards Compatibility Promise text (webmozart) +- `0029408 `_ #3558 Created Documentation CHANGELOG (WouterJ) +- `f6dd678 `_ #3548 Update forms.rst (atmosf3ar) +- `527c8b6 `_ #3496 Added a section about using named assets (vmattila) + +Fixed Documentation +~~~~~~~~~~~~~~~~~~~ + +- `5c367b4 `_ #3517 Fixed OptionsResolver component docs (WouterJ) +- `adcbb5d `_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut) +- `a21fb26 `_ #3559 Remove reference to copying parameters.yml from Git cookbook (pwaring) +- `de71a51 `_ #3551 [Cookbook][Dynamic Form Modification] Fix sample code (rybakit) +- `143db2f `_ #3550 Update introduction.rst (taavit) +- `384538b `_ #3549 Fixed createPropertyAccessorBuilder usage (antonbabenko) +- `d275302 `_ #3541 Update generic_event.rst (Lumbendil) +- `819949c `_ #3537 Add missing variable assignment (colinodell) +- `d7e8262 `_ #3535 fix form type name. (yositani2002) +- `821af3b `_ #3493 Type fix in remove.rst (weaverryan) +- `003230f `_ #3530 Update form_customization.rst (dczech) +- `696313c `_ #3513 [Component-DI] Fixed typo (saro0h) +- `27dcebd `_ #3509 Fix typo: side.bar.twig => sidebar.twig (ifdattic) +- `e385d28 `_ #3503 file extension correction xfliff to xliff (nixilla) +- `7fe0de3 `_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka) +- `8155e4c `_ #3473 Update proxy_examples.rst (AZielinski) + +Minor Documentation Changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- `0928249 `_ #3568 Update checkbox_compound.rst.inc (joshuaadickerson) +- `38def3b `_ #3567 Update checkbox_compound.rst.inc (joshuaadickerson) +- `15d8ab8 `_ #3553 Minimize horizontal scrolling in code blocks to improve readability (ifdattic) +- `5120863 `_ #3547 Update acl.rst (iqfoundry) +- `d974c77 `_ #3556 Fix PSR error (ifdattic) +- `f4bb017 `_ #3555 Wrap variables in {} for safer interpolation (ifdattic) +- `5f02bca `_ #3552 Fix typos (ifdattic) +- `6e32c47 `_ #3546 Fix README: contributions should be based off 2.3 or higher (colinodell) +- `ffa8f76 `_ #3545 Example of getting entity managers directly from the container (colinodell) +- `6a2a55b `_ #3579 Fix build errors (xabbuh) +- `73adf8b `_ #3528 Clarify service parameters usages (WouterJ) +- `9ba4fa7 `_ #3527 Changes to components domcrawler (ifdattic) +- `8973c81 `_ #3526 Changes for Console component (ifdattic) +- `6848bed `_ #3538 Rebasing #3518 (weaverryan) +- `c838df8 `_ #3511 [Component-DI] Removed useless else statement in code example (saro0h) +- `1af6742 `_ #3510 add empty line (lazyants) +- `1131247 `_ #3508 Add 'in XML' for additional clarity (ifdattic) +- `a650b93 `_ #3506 Nykopol overriden options (weaverryan) +- `ab10035 `_ #3505 replace Akamaï with Akamai (xabbuh) +- `7f56c20 `_ #3501 [Security] Fix markup (tyx) +- `80a90ba `_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic) +- `e5bc4ea `_ #3498 Remove second empty data (xabbuh) +- `d084d87 `_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi) +- `3250aba `_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic) + +January, 2014 +------------- New Documentation ~~~~~~~~~~~~~~~~~ -- `322972e `_ #3803 [Book][Validation] configuration examples for the GroupSequenceProvider (xabbuh) -- `d4ca16a `_ #3743 Improve examples in parent services (WouterJ) -- `d611e77 `_ #3701 [Serializer] add documentation for serializer callbacks (cordoval) -- `80c645c `_ #3719 Fixed event listeners priority (tony-co) +No changes Fixed Documentation ~~~~~~~~~~~~~~~~~~~ -- `f801e2e `_ #3805 Add missing autocomplete argument in askAndValidate method (ifdattic) -- `a81d367 `_ #3786 replaceArguments should be setArguments (RobinvdVleuten) -- `33b64e1 `_ #3788 Fix link for StopwatchEvent class (rpg600) -- `529d4ce `_ #3761 buildViewBottomUp has been renamed to finishView (Nyholm) -- `d743139 `_ #3768 the Locale component does not have elements tagged with @api (xabbuh) -- `2b8e44d `_ #3747 Fix Image constraint class and validator link (weaverryan) -- `fa362ca `_ #3741 correct RuntimeException reference (shieldo) -- `d92545e `_ #3734 [book] [testing] fixed the path of the phpunit.xml file (javiereguiluz) +- `e385d28 `_ #3503 file extension correction xfliff to xliff (nixilla) +- `7fe0de3 `_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka) +- `8155e4c `_ #3473 Update proxy_examples.rst (AZielinski) +- `c205bc6 `_ #3468 enclose YAML string with double quotes to fix syntax highlighting (xabbuh) +- `89963cc `_ #3463 Fix typos in cookbook/testing/database (ifdattic) +- `e0a52ec `_ #3460 remove confusing outdated note on interactive rebasing (xabbuh) +- `6831b13 `_ #3455 [Contributing][Code] fix indentation so that the text is rendered properly (xabbuh) +- `ea5816f `_ #3433 [WIP][Reference][Form Types] Update "radio" form type (bicpi) +- `42c80d1 `_ #3448 Overridden tweak (weaverryan) +- `d9d7c58 `_ #3444 Fix issue #3442 (ifdattic) +- `9e2e64b `_ #3427 Removed code references to Symfony Standard Distribution (danielcsgomes) +- `26b8146 `_ #3415 [#3334] the data_class option was not introduced in 2.4 (xabbuh) +- `0b2a491 `_ #3414 add missing code-block directive (xabbuh) +- `4988118 `_ #3432 [Reference][Form Types] Add "max_length" option in form type (nykopol) +- `26a7b1b `_ #3423 [Session Configuration] add clarifying notes on session save handler proxies (cordoval) Minor Documentation Changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- `1094a13 `_ #3807 Added some exceptions to the method order in CS (stof) -- `55442b5 `_ #3800 Fixed another blockquote rendering issue (WouterJ) -- `969fd71 `_ #3785 ensure that destination directories don't exist before creating them (xabbuh) -- `79322ff `_ #3799 Fix list to not render in a block quote (WouterJ) -- `1a6f730 `_ #3793 language tweak for the tip introduced in #3743 (xabbuh) -- `dda9e88 `_ #3778 Adding information on internal reverse proxy (tcz) -- `d36bbd9 `_ #3765 [WIP] make headlines consistent with our standards (xabbuh) -- `daa81a0 `_ #3766 [Book] add note about services and the service container in the form cha... (xabbuh) -- `4529858 `_ #3767 [Book] link to the bc promise in the stable API description (xabbuh) -- `a5471b3 `_ #3775 Fixed variable naming (peterrehm) -- `703c2a6 `_ #3772 [Cookbook][Sessions] some language improvements (xabbuh) -- `3d30b56 `_ #3773 modify Symfony CMF configuration values in the build process so that the... (xabbuh) -- `cfd6d7c `_ #3758 [Book][Routing] Fixed typo on PHP version of a route definition (saro0h) -- `6bd134c `_ #3754 ignore more files and directories which are created when building the documentation (xabbuh) -- `54d6a9e `_ #3736 [book] Misc. routing fixes (javiereguiluz) -- `f149dcf `_ #3739 [book] [forms] misc. fixes and tweaks (javiereguiluz) -- `ce582ec `_ #3735 [book] [controller] fixed the code of a session sample code (javiereguiluz) -- `499ba5c `_ #3733 [book] [validation] fixed typos (javiereguiluz) -- `4d0ff8f `_ #3732 Update routing.rst. Explain using url() v. path(). (ackerman) -- `44c6273 `_ #3727 Added a note about inlined private services (javiereguiluz) \ No newline at end of file +- `1131247 `_ #3508 Add 'in XML' for additional clarity (ifdattic) +- `a650b93 `_ #3506 Nykopol overriden options (weaverryan) +- `ab10035 `_ #3505 replace Akamaï with Akamai (xabbuh) +- `7f56c20 `_ #3501 [Security] Fix markup (tyx) +- `80a90ba `_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic) +- `e5bc4ea `_ #3498 Remove second empty data (xabbuh) +- `d084d87 `_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi) +- `3250aba `_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic) +- `f285d93 `_ #3451 some language tweaks (AE, third-person perspective) (xabbuh) +- `2b7e0f6 `_ #3497 Fix highlighting (WouterJ) +- `a535ae0 `_ #3471 Fixed `````versionadded````` inconsistencies in Symfony 2.3 (danielcsgomes) +- `f077a8e `_ #3465 change wording in versionadded example to be consistent with what we use... (xabbuh) +- `f9f7548 `_ #3462 Replace ... with etc (ifdattic) +- `65efcc4 `_ #3445 [Reference][Form Types] Add missing (but existing) options to "form" type (bicpi) +- `1d1b91d `_ #3431 [Config] add cautionary note on ini file loader limitation (cordoval) +- `f2eaf9b `_ #3419 doctrine file upload example uses dir -- caution added (cordoval) +- `72b53ad `_ #3404 [#3276] Trying to further clarify the session storage directory details (weaverryan) +- `67b7bbd `_ #3413 [Cookbook][Bundles] improve explanation of code block for bundle removal (cordoval) +- `7c5a914 `_ #3369 Indicate that Group Sequence Providers can use YAML (karptonite) +- `1e0311e `_ #3416 add empty_data option where required option is used (xabbuh) +- `2be3f52 `_ #3422 [Cookbook][Custom Authentication Provider] add a note of warning for when forbidding anonymous users (cordoval) From 66dffb04dfb23b505ab854f49647e7e8463c981a Mon Sep 17 00:00:00 2001 From: WouterJ Date: Tue, 6 May 2014 16:37:54 +0200 Subject: [PATCH 11/17] Added April changelog --- changelog.rst | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/changelog.rst b/changelog.rst index bb3f4e54a2c..3de4a85fa59 100644 --- a/changelog.rst +++ b/changelog.rst @@ -228,3 +228,56 @@ Minor Documentation Changes - `664a0be `_ #3633 Added missing PHP syntax coloration (DerekRoth) - `1714a31 `_ #3585 Use consistent method chaining in BlogBundle sample application (ockcyp) - `cb61f4f `_ #3581 Add missing hyphen in HTTP Fundamentals page (ockcyp) + + +April, 2014 +----------- + +New Documentation +~~~~~~~~~~~~~~~~~ + +- `322972e `_ #3803 [Book][Validation] configuration examples for the GroupSequenceProvider (xabbuh) +- `d4ca16a `_ #3743 Improve examples in parent services (WouterJ) +- `70a3893 `_ #3774 [Book][Internals] add description for the kernel.finish_request event (xabbuh) +- `d611e77 `_ #3701 [Serializer] add documentation for serializer callbacks (cordoval) +- `80c645c `_ #3719 Fixed event listeners priority (tony-co) + +Fixed Documentation +~~~~~~~~~~~~~~~~~~~ + +- `f801e2e `_ #3805 Add missing autocomplete argument in askAndValidate method (ifdattic) +- `a81d367 `_ #3786 replaceArguments should be setArguments (RobinvdVleuten) +- `33b64e1 `_ #3788 Fix link for StopwatchEvent class (rpg600) +- `2ebabfb `_ #3792 Update commands_as_services.rst (mimol91) +- `529d4ce `_ #3761 buildViewBottomUp has been renamed to finishView (Nyholm) +- `d743139 `_ #3768 the Locale component does not have elements tagged with @api (xabbuh) +- `2b8e44d `_ #3747 Fix Image constraint class and validator link (weaverryan) +- `fa362ca `_ #3741 correct RuntimeException reference (shieldo) +- `d92545e `_ #3734 [book] [testing] fixed the path of the phpunit.xml file (javiereguiluz) + +Minor Documentation Changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- `136f98c `_ #3784 [Expression Langage] be consistent in "print/print out" uses (mickaelandrieu) +- `1094a13 `_ #3807 Added some exceptions to the method order in CS (stof) +- `55442b5 `_ #3800 Fixed another blockquote rendering issue (WouterJ) +- `969fd71 `_ #3785 ensure that destination directories don't exist before creating them (xabbuh) +- `79322ff `_ #3799 Fix list to not render in a block quote (WouterJ) +- `1a6f730 `_ #3793 language tweak for the tip introduced in #3743 (xabbuh) +- `dda9e88 `_ #3778 Adding information on internal reverse proxy (tcz) +- `d36bbd9 `_ #3765 [WIP] make headlines consistent with our standards (xabbuh) +- `daa81a0 `_ #3766 [Book] add note about services and the service container in the form cha... (xabbuh) +- `4529858 `_ #3767 [Book] link to the bc promise in the stable API description (xabbuh) +- `a5471b3 `_ #3775 Fixed variable naming (peterrehm) +- `703c2a6 `_ #3772 [Cookbook][Sessions] some language improvements (xabbuh) +- `3d30b56 `_ #3773 modify Symfony CMF configuration values in the build process so that the... (xabbuh) +- `cfd6d7c `_ #3758 [Book][Routing] Fixed typo on PHP version of a route definition (saro0h) +- `6bd134c `_ #3754 ignore more files and directories which are created when building the documentation (xabbuh) +- `610462e `_ #3755 [Cookbook][Security] Firewall resitrction tweaks, fix markup, add to toc (xabbuh) +- `0a21718 `_ #3695 Firewall backport (weaverryan) +- `54d6a9e `_ #3736 [book] Misc. routing fixes (javiereguiluz) +- `f149dcf `_ #3739 [book] [forms] misc. fixes and tweaks (javiereguiluz) +- `ce582ec `_ #3735 [book] [controller] fixed the code of a session sample code (javiereguiluz) +- `499ba5c `_ #3733 [book] [validation] fixed typos (javiereguiluz) +- `4d0ff8f `_ #3732 Update routing.rst. Explain using url() v. path(). (ackerman) +- `44c6273 `_ #3727 Added a note about inlined private services (javiereguiluz) \ No newline at end of file From 513a389cb9aa45bc676016c15f4f156f172f6b31 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Tue, 6 May 2014 16:38:43 +0200 Subject: [PATCH 12/17] [#3797] Reordered changelog --- changelog.rst | 292 +++++++++++++++++++++++++------------------------- 1 file changed, 145 insertions(+), 147 deletions(-) diff --git a/changelog.rst b/changelog.rst index 3de4a85fa59..bc667a30c9c 100644 --- a/changelog.rst +++ b/changelog.rst @@ -13,126 +13,57 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. - -January, 2014 -------------- - -New Documentation -~~~~~~~~~~~~~~~~~ - -- `d52f3f8 `_ #3454 [Security] Add host option (ghostika) -- `6b3c424 `_ #3428 Translation - Added info about JsonFileLoader added in 2.4 (singles) - -Fixed Documentation -~~~~~~~~~~~~~~~~~~~ - -- `fb22fa0 `_ #3456 remove duplicate label (xabbuh) -- `c205bc6 `_ #3468 enclose YAML string with double quotes to fix syntax highlighting (xabbuh) -- `89963cc `_ #3463 Fix typos in cookbook/testing/database (ifdattic) -- `e0a52ec `_ #3460 remove confusing outdated note on interactive rebasing (xabbuh) -- `6831b13 `_ #3455 [Contributing][Code] fix indentation so that the text is rendered properly (xabbuh) -- `ea5816f `_ #3433 [WIP][Reference][Form Types] Update "radio" form type (bicpi) -- `42c80d1 `_ #3448 Overridden tweak (weaverryan) -- `bede4c3 `_ #3447 Fix error in namespace when use TokenInterface (joanteixi) -- `d9d7c58 `_ #3444 Fix issue #3442 (ifdattic) -- `a6ad607 `_ #3441 [Expression]Change title 'Accessing Public Methods' (Pyrech) -- `9e2e64b `_ #3427 Removed code references to Symfony Standard Distribution (danielcsgomes) -- `3c2c5fc `_ #3435 Update custom_password_authenticator.rst (boardyuk) -- `26b8146 `_ #3415 [#3334] the data_class option was not introduced in 2.4 (xabbuh) -- `0b2a491 `_ #3414 add missing code-block directive (xabbuh) -- `4988118 `_ #3432 [Reference][Form Types] Add "max_length" option in form type (nykopol) -- `26a7b1b `_ #3423 [Session Configuration] add clarifying notes on session save handler proxies (cordoval) -- `f2f5e9a `_ #3421 [Contributing] Cleaning the "contributing patch" page a bit (lemoinem) - -Minor Documentation Changes -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -- `f285d93 `_ #3451 some language tweaks (AE, third-person perspective) (xabbuh) -- `b9bbe5d `_ #3499 Fix YAML syntax highlight + remove trailing whitespace (ifdattic) -- `2b7e0f6 `_ #3497 Fix highlighting (WouterJ) -- `a535ae0 `_ #3471 Fixed `````versionadded````` inconsistencies in Symfony 2.3 (danielcsgomes) -- `f077a8e `_ #3465 change wording in versionadded example to be consistent with what we use... (xabbuh) -- `f9f7548 `_ #3462 Replace ... with etc (ifdattic) -- `65efcc4 `_ #3445 [Reference][Form Types] Add missing (but existing) options to "form" type (bicpi) -- `1d1b91d `_ #3431 [Config] add cautionary note on ini file loader limitation (cordoval) -- `f2eaf9b `_ #3419 doctrine file upload example uses dir -- caution added (cordoval) -- `72b53ad `_ #3404 [#3276] Trying to further clarify the session storage directory details (weaverryan) -- `67b7bbd `_ #3413 [Cookbook][Bundles] improve explanation of code block for bundle removal (cordoval) -- `7c5a914 `_ #3369 Indicate that Group Sequence Providers can use YAML (karptonite) -- `1e0311e `_ #3416 add empty_data option where required option is used (xabbuh) -- `2be3f52 `_ #3422 [Cookbook][Custom Authentication Provider] add a note of warning for when forbidding anonymous users (cordoval) -- `e255de9 `_ #3429 [Reference][Form Types] Document "with_minutes" time/datetime option (bicpi) - -February, 2014 --------------- +April, 2014 +----------- New Documentation ~~~~~~~~~~~~~~~~~ -- `9dcf467 `_ #3613 Javiereguiluz revamped quick tour (weaverryan) -- `89c6f1d `_ #3439 [Review] Added detailed Backwards Compatibility Promise text (webmozart) -- `0029408 `_ #3558 Created Documentation CHANGELOG (WouterJ) -- `f6dd678 `_ #3548 Update forms.rst (atmosf3ar) -- `9676f2c `_ #3523 [Components][EventDispatcher] describe that the event name and the event dispatcher are passed to even... (xabbuh) -- `5c367b4 `_ #3517 Fixed OptionsResolver component docs (WouterJ) -- `527c8b6 `_ #3496 Added a section about using named assets (vmattila) +- `322972e `_ #3803 [Book][Validation] configuration examples for the GroupSequenceProvider (xabbuh) +- `d4ca16a `_ #3743 Improve examples in parent services (WouterJ) +- `70a3893 `_ #3774 [Book][Internals] add description for the kernel.finish_request event (xabbuh) +- `d611e77 `_ #3701 [Serializer] add documentation for serializer callbacks (cordoval) +- `80c645c `_ #3719 Fixed event listeners priority (tony-co) Fixed Documentation ~~~~~~~~~~~~~~~~~~~ -- `adcbb5d `_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut) -- `5c4336a `_ #3570 Callback: [Validator, validate] expects validate to be static (nixilla) -- `a21fb26 `_ #3559 Remove reference to copying parameters.yml from Git cookbook (pwaring) -- `de71a51 `_ #3551 [Cookbook][Dynamic Form Modification] Fix sample code (rybakit) -- `143db2f `_ #3550 Update introduction.rst (taavit) -- `384538b `_ #3549 Fixed createPropertyAccessorBuilder usage (antonbabenko) -- `d275302 `_ #3541 Update generic_event.rst (Lumbendil) -- `819949c `_ #3537 Add missing variable assignment (colinodell) -- `d7e8262 `_ #3535 fix form type name. (yositani2002) -- `821af3b `_ #3493 Type fix in remove.rst (weaverryan) -- `003230f `_ #3530 Update form_customization.rst (dczech) -- `a43f15a `_ #3519 [Book][Service Container] Fix syntax highlighting (iamdto) -- `86e02c6 `_ #3514 Fixed some small typos in code example (RobinvdVleuten) -- `696313c `_ #3513 [Component-DI] Fixed typo (saro0h) -- `27dcebd `_ #3509 Fix typo: side.bar.twig => sidebar.twig (ifdattic) -- `0dc8c26 `_ #3507 Fix a typo (missing `````) in ``:doc:`` link (ifdattic) -- `272197b `_ #3504 fix include directive so that the contents are really included (xabbuh) -- `e385d28 `_ #3503 file extension correction xfliff to xliff (nixilla) -- `6d34aa6 `_ #3478 Update custom_password_authenticator.rst (piotras-s) -- `a171700 `_ #3477 Api key user provider should use "implements" instead of "extends" (skowi) -- `7fe0de3 `_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka) -- `8155e4c `_ #3473 Update proxy_examples.rst (AZielinski) +- `f801e2e `_ #3805 Add missing autocomplete argument in askAndValidate method (ifdattic) +- `a81d367 `_ #3786 replaceArguments should be setArguments (RobinvdVleuten) +- `33b64e1 `_ #3788 Fix link for StopwatchEvent class (rpg600) +- `2ebabfb `_ #3792 Update commands_as_services.rst (mimol91) +- `529d4ce `_ #3761 buildViewBottomUp has been renamed to finishView (Nyholm) +- `d743139 `_ #3768 the Locale component does not have elements tagged with @api (xabbuh) +- `2b8e44d `_ #3747 Fix Image constraint class and validator link (weaverryan) +- `fa362ca `_ #3741 correct RuntimeException reference (shieldo) +- `d92545e `_ #3734 [book] [testing] fixed the path of the phpunit.xml file (javiereguiluz) Minor Documentation Changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- `0928249 `_ #3568 Update checkbox_compound.rst.inc (joshuaadickerson) -- `38def3b `_ #3567 Update checkbox_compound.rst.inc (joshuaadickerson) -- `15d8ab8 `_ #3553 Minimize horizontal scrolling in code blocks to improve readability (ifdattic) -- `5120863 `_ #3547 Update acl.rst (iqfoundry) -- `b7ac326 `_ #3557 Minimize horizontal scrolling in code block to improve readability (ifdattic) -- `d974c77 `_ #3556 Fix PSR error (ifdattic) -- `f4bb017 `_ #3555 Wrap variables in {} for safer interpolation (ifdattic) -- `5f02bca `_ #3552 Fix typos (ifdattic) -- `6e32c47 `_ #3546 Fix README: contributions should be based off 2.3 or higher (colinodell) -- `ffa8f76 `_ #3545 Example of getting entity managers directly from the container (colinodell) -- `6a2a55b `_ #3579 Fix build errors (xabbuh) -- `dce2e23 `_ #3532 Added tip for Entity Listeners (slavafomin) -- `73adf8b `_ #3528 Clarify service parameters usages (WouterJ) -- `f634600 `_ #3531 Remove horizontal scrolling in code block (ifdattic) -- `9ba4fa7 `_ #3527 Changes to components domcrawler (ifdattic) -- `8973c81 `_ #3526 Changes for Console component (ifdattic) -- `6848bed `_ #3538 Rebasing #3518 (weaverryan) -- `c838df8 `_ #3511 [Component-DI] Removed useless else statement in code example (saro0h) -- `1af6742 `_ #3510 add empty line (lazyants) -- `1131247 `_ #3508 Add 'in XML' for additional clarity (ifdattic) -- `a650b93 `_ #3506 Nykopol overriden options (weaverryan) -- `ab10035 `_ #3505 replace Akamaï with Akamai (xabbuh) -- `7f56c20 `_ #3501 [Security] Fix markup (tyx) -- `80a90ba `_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic) -- `e5bc4ea `_ #3498 Remove second empty data (xabbuh) -- `d084d87 `_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi) -- `3250aba `_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic) +- `136f98c `_ #3784 [Expression Langage] be consistent in "print/print out" uses (mickaelandrieu) +- `1094a13 `_ #3807 Added some exceptions to the method order in CS (stof) +- `55442b5 `_ #3800 Fixed another blockquote rendering issue (WouterJ) +- `969fd71 `_ #3785 ensure that destination directories don't exist before creating them (xabbuh) +- `79322ff `_ #3799 Fix list to not render in a block quote (WouterJ) +- `1a6f730 `_ #3793 language tweak for the tip introduced in #3743 (xabbuh) +- `dda9e88 `_ #3778 Adding information on internal reverse proxy (tcz) +- `d36bbd9 `_ #3765 [WIP] make headlines consistent with our standards (xabbuh) +- `daa81a0 `_ #3766 [Book] add note about services and the service container in the form cha... (xabbuh) +- `4529858 `_ #3767 [Book] link to the bc promise in the stable API description (xabbuh) +- `a5471b3 `_ #3775 Fixed variable naming (peterrehm) +- `703c2a6 `_ #3772 [Cookbook][Sessions] some language improvements (xabbuh) +- `3d30b56 `_ #3773 modify Symfony CMF configuration values in the build process so that the... (xabbuh) +- `cfd6d7c `_ #3758 [Book][Routing] Fixed typo on PHP version of a route definition (saro0h) +- `6bd134c `_ #3754 ignore more files and directories which are created when building the documentation (xabbuh) +- `610462e `_ #3755 [Cookbook][Security] Firewall resitrction tweaks, fix markup, add to toc (xabbuh) +- `0a21718 `_ #3695 Firewall backport (weaverryan) +- `54d6a9e `_ #3736 [book] Misc. routing fixes (javiereguiluz) +- `f149dcf `_ #3739 [book] [forms] misc. fixes and tweaks (javiereguiluz) +- `ce582ec `_ #3735 [book] [controller] fixed the code of a session sample code (javiereguiluz) +- `499ba5c `_ #3733 [book] [validation] fixed typos (javiereguiluz) +- `4d0ff8f `_ #3732 Update routing.rst. Explain using url() v. path(). (ackerman) +- `44c6273 `_ #3727 Added a note about inlined private services (javiereguiluz) March, 2014 ----------- @@ -229,55 +160,122 @@ Minor Documentation Changes - `1714a31 `_ #3585 Use consistent method chaining in BlogBundle sample application (ockcyp) - `cb61f4f `_ #3581 Add missing hyphen in HTTP Fundamentals page (ockcyp) +February, 2014 +-------------- -April, 2014 ------------ +New Documentation +~~~~~~~~~~~~~~~~~ + +- `9dcf467 `_ #3613 Javiereguiluz revamped quick tour (weaverryan) +- `89c6f1d `_ #3439 [Review] Added detailed Backwards Compatibility Promise text (webmozart) +- `0029408 `_ #3558 Created Documentation CHANGELOG (WouterJ) +- `f6dd678 `_ #3548 Update forms.rst (atmosf3ar) +- `9676f2c `_ #3523 [Components][EventDispatcher] describe that the event name and the event dispatcher are passed to even... (xabbuh) +- `5c367b4 `_ #3517 Fixed OptionsResolver component docs (WouterJ) +- `527c8b6 `_ #3496 Added a section about using named assets (vmattila) + +Fixed Documentation +~~~~~~~~~~~~~~~~~~~ + +- `adcbb5d `_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut) +- `5c4336a `_ #3570 Callback: [Validator, validate] expects validate to be static (nixilla) +- `a21fb26 `_ #3559 Remove reference to copying parameters.yml from Git cookbook (pwaring) +- `de71a51 `_ #3551 [Cookbook][Dynamic Form Modification] Fix sample code (rybakit) +- `143db2f `_ #3550 Update introduction.rst (taavit) +- `384538b `_ #3549 Fixed createPropertyAccessorBuilder usage (antonbabenko) +- `d275302 `_ #3541 Update generic_event.rst (Lumbendil) +- `819949c `_ #3537 Add missing variable assignment (colinodell) +- `d7e8262 `_ #3535 fix form type name. (yositani2002) +- `821af3b `_ #3493 Type fix in remove.rst (weaverryan) +- `003230f `_ #3530 Update form_customization.rst (dczech) +- `a43f15a `_ #3519 [Book][Service Container] Fix syntax highlighting (iamdto) +- `86e02c6 `_ #3514 Fixed some small typos in code example (RobinvdVleuten) +- `696313c `_ #3513 [Component-DI] Fixed typo (saro0h) +- `27dcebd `_ #3509 Fix typo: side.bar.twig => sidebar.twig (ifdattic) +- `0dc8c26 `_ #3507 Fix a typo (missing `````) in ``:doc:`` link (ifdattic) +- `272197b `_ #3504 fix include directive so that the contents are really included (xabbuh) +- `e385d28 `_ #3503 file extension correction xfliff to xliff (nixilla) +- `6d34aa6 `_ #3478 Update custom_password_authenticator.rst (piotras-s) +- `a171700 `_ #3477 Api key user provider should use "implements" instead of "extends" (skowi) +- `7fe0de3 `_ #3475 Fixed doc for framework.session.cookie_lifetime refrence. (tyomo4ka) +- `8155e4c `_ #3473 Update proxy_examples.rst (AZielinski) + +Minor Documentation Changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- `0928249 `_ #3568 Update checkbox_compound.rst.inc (joshuaadickerson) +- `38def3b `_ #3567 Update checkbox_compound.rst.inc (joshuaadickerson) +- `15d8ab8 `_ #3553 Minimize horizontal scrolling in code blocks to improve readability (ifdattic) +- `5120863 `_ #3547 Update acl.rst (iqfoundry) +- `b7ac326 `_ #3557 Minimize horizontal scrolling in code block to improve readability (ifdattic) +- `d974c77 `_ #3556 Fix PSR error (ifdattic) +- `f4bb017 `_ #3555 Wrap variables in {} for safer interpolation (ifdattic) +- `5f02bca `_ #3552 Fix typos (ifdattic) +- `6e32c47 `_ #3546 Fix README: contributions should be based off 2.3 or higher (colinodell) +- `ffa8f76 `_ #3545 Example of getting entity managers directly from the container (colinodell) +- `6a2a55b `_ #3579 Fix build errors (xabbuh) +- `dce2e23 `_ #3532 Added tip for Entity Listeners (slavafomin) +- `73adf8b `_ #3528 Clarify service parameters usages (WouterJ) +- `f634600 `_ #3531 Remove horizontal scrolling in code block (ifdattic) +- `9ba4fa7 `_ #3527 Changes to components domcrawler (ifdattic) +- `8973c81 `_ #3526 Changes for Console component (ifdattic) +- `6848bed `_ #3538 Rebasing #3518 (weaverryan) +- `c838df8 `_ #3511 [Component-DI] Removed useless else statement in code example (saro0h) +- `1af6742 `_ #3510 add empty line (lazyants) +- `1131247 `_ #3508 Add 'in XML' for additional clarity (ifdattic) +- `a650b93 `_ #3506 Nykopol overriden options (weaverryan) +- `ab10035 `_ #3505 replace Akamaï with Akamai (xabbuh) +- `7f56c20 `_ #3501 [Security] Fix markup (tyx) +- `80a90ba `_ #3500 Minimize horizontal scrolling in code blocks (improve readability) (ifdattic) +- `e5bc4ea `_ #3498 Remove second empty data (xabbuh) +- `d084d87 `_ #3485 [Cookbook][Assetic] Fix "javascripts" tag name typo (bicpi) +- `3250aba `_ #3481 Fix code block (minimise horizontal scrolling), typo in yaml (ifdattic) + +January, 2014 +------------- New Documentation ~~~~~~~~~~~~~~~~~ -- `322972e `_ #3803 [Book][Validation] configuration examples for the GroupSequenceProvider (xabbuh) -- `d4ca16a `_ #3743 Improve examples in parent services (WouterJ) -- `70a3893 `_ #3774 [Book][Internals] add description for the kernel.finish_request event (xabbuh) -- `d611e77 `_ #3701 [Serializer] add documentation for serializer callbacks (cordoval) -- `80c645c `_ #3719 Fixed event listeners priority (tony-co) +- `d52f3f8 `_ #3454 [Security] Add host option (ghostika) +- `6b3c424 `_ #3428 Translation - Added info about JsonFileLoader added in 2.4 (singles) Fixed Documentation ~~~~~~~~~~~~~~~~~~~ -- `f801e2e `_ #3805 Add missing autocomplete argument in askAndValidate method (ifdattic) -- `a81d367 `_ #3786 replaceArguments should be setArguments (RobinvdVleuten) -- `33b64e1 `_ #3788 Fix link for StopwatchEvent class (rpg600) -- `2ebabfb `_ #3792 Update commands_as_services.rst (mimol91) -- `529d4ce `_ #3761 buildViewBottomUp has been renamed to finishView (Nyholm) -- `d743139 `_ #3768 the Locale component does not have elements tagged with @api (xabbuh) -- `2b8e44d `_ #3747 Fix Image constraint class and validator link (weaverryan) -- `fa362ca `_ #3741 correct RuntimeException reference (shieldo) -- `d92545e `_ #3734 [book] [testing] fixed the path of the phpunit.xml file (javiereguiluz) +- `fb22fa0 `_ #3456 remove duplicate label (xabbuh) +- `c205bc6 `_ #3468 enclose YAML string with double quotes to fix syntax highlighting (xabbuh) +- `89963cc `_ #3463 Fix typos in cookbook/testing/database (ifdattic) +- `e0a52ec `_ #3460 remove confusing outdated note on interactive rebasing (xabbuh) +- `6831b13 `_ #3455 [Contributing][Code] fix indentation so that the text is rendered properly (xabbuh) +- `ea5816f `_ #3433 [WIP][Reference][Form Types] Update "radio" form type (bicpi) +- `42c80d1 `_ #3448 Overridden tweak (weaverryan) +- `bede4c3 `_ #3447 Fix error in namespace when use TokenInterface (joanteixi) +- `d9d7c58 `_ #3444 Fix issue #3442 (ifdattic) +- `a6ad607 `_ #3441 [Expression]Change title 'Accessing Public Methods' (Pyrech) +- `9e2e64b `_ #3427 Removed code references to Symfony Standard Distribution (danielcsgomes) +- `3c2c5fc `_ #3435 Update custom_password_authenticator.rst (boardyuk) +- `26b8146 `_ #3415 [#3334] the data_class option was not introduced in 2.4 (xabbuh) +- `0b2a491 `_ #3414 add missing code-block directive (xabbuh) +- `4988118 `_ #3432 [Reference][Form Types] Add "max_length" option in form type (nykopol) +- `26a7b1b `_ #3423 [Session Configuration] add clarifying notes on session save handler proxies (cordoval) +- `f2f5e9a `_ #3421 [Contributing] Cleaning the "contributing patch" page a bit (lemoinem) Minor Documentation Changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- `136f98c `_ #3784 [Expression Langage] be consistent in "print/print out" uses (mickaelandrieu) -- `1094a13 `_ #3807 Added some exceptions to the method order in CS (stof) -- `55442b5 `_ #3800 Fixed another blockquote rendering issue (WouterJ) -- `969fd71 `_ #3785 ensure that destination directories don't exist before creating them (xabbuh) -- `79322ff `_ #3799 Fix list to not render in a block quote (WouterJ) -- `1a6f730 `_ #3793 language tweak for the tip introduced in #3743 (xabbuh) -- `dda9e88 `_ #3778 Adding information on internal reverse proxy (tcz) -- `d36bbd9 `_ #3765 [WIP] make headlines consistent with our standards (xabbuh) -- `daa81a0 `_ #3766 [Book] add note about services and the service container in the form cha... (xabbuh) -- `4529858 `_ #3767 [Book] link to the bc promise in the stable API description (xabbuh) -- `a5471b3 `_ #3775 Fixed variable naming (peterrehm) -- `703c2a6 `_ #3772 [Cookbook][Sessions] some language improvements (xabbuh) -- `3d30b56 `_ #3773 modify Symfony CMF configuration values in the build process so that the... (xabbuh) -- `cfd6d7c `_ #3758 [Book][Routing] Fixed typo on PHP version of a route definition (saro0h) -- `6bd134c `_ #3754 ignore more files and directories which are created when building the documentation (xabbuh) -- `610462e `_ #3755 [Cookbook][Security] Firewall resitrction tweaks, fix markup, add to toc (xabbuh) -- `0a21718 `_ #3695 Firewall backport (weaverryan) -- `54d6a9e `_ #3736 [book] Misc. routing fixes (javiereguiluz) -- `f149dcf `_ #3739 [book] [forms] misc. fixes and tweaks (javiereguiluz) -- `ce582ec `_ #3735 [book] [controller] fixed the code of a session sample code (javiereguiluz) -- `499ba5c `_ #3733 [book] [validation] fixed typos (javiereguiluz) -- `4d0ff8f `_ #3732 Update routing.rst. Explain using url() v. path(). (ackerman) -- `44c6273 `_ #3727 Added a note about inlined private services (javiereguiluz) \ No newline at end of file +- `f285d93 `_ #3451 some language tweaks (AE, third-person perspective) (xabbuh) +- `b9bbe5d `_ #3499 Fix YAML syntax highlight + remove trailing whitespace (ifdattic) +- `2b7e0f6 `_ #3497 Fix highlighting (WouterJ) +- `a535ae0 `_ #3471 Fixed `````versionadded````` inconsistencies in Symfony 2.3 (danielcsgomes) +- `f077a8e `_ #3465 change wording in versionadded example to be consistent with what we use... (xabbuh) +- `f9f7548 `_ #3462 Replace ... with etc (ifdattic) +- `65efcc4 `_ #3445 [Reference][Form Types] Add missing (but existing) options to "form" type (bicpi) +- `1d1b91d `_ #3431 [Config] add cautionary note on ini file loader limitation (cordoval) +- `f2eaf9b `_ #3419 doctrine file upload example uses dir -- caution added (cordoval) +- `72b53ad `_ #3404 [#3276] Trying to further clarify the session storage directory details (weaverryan) +- `67b7bbd `_ #3413 [Cookbook][Bundles] improve explanation of code block for bundle removal (cordoval) +- `7c5a914 `_ #3369 Indicate that Group Sequence Providers can use YAML (karptonite) +- `1e0311e `_ #3416 add empty_data option where required option is used (xabbuh) +- `2be3f52 `_ #3422 [Cookbook][Custom Authentication Provider] add a note of warning for when forbidding anonymous users (cordoval) +- `e255de9 `_ #3429 [Reference][Form Types] Document "with_minutes" time/datetime option (bicpi) From 6188298554b7cf8fe4ceb430423076b97604505d Mon Sep 17 00:00:00 2001 From: micheal Date: Sat, 26 Apr 2014 18:01:39 -0700 Subject: [PATCH 13/17] Update csrf_in_login_form.rst We want to protect against CSRF, not allow it. :) --- cookbook/security/csrf_in_login_form.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cookbook/security/csrf_in_login_form.rst b/cookbook/security/csrf_in_login_form.rst index b833fedb382..d957a2585b5 100644 --- a/cookbook/security/csrf_in_login_form.rst +++ b/cookbook/security/csrf_in_login_form.rst @@ -1,8 +1,8 @@ .. index:: - single: Security; CSRF in the Login Form + single: Security; CSRF Protection in the Login Form -Using CSRF in the Login Form -============================ +Using CSRF Protection in the Login Form +======================================= When using a login form, you should make sure that you are protected against CSRF (`Cross-site request forgery`_). The Security component already has built-in support @@ -13,11 +13,11 @@ for CSRF. In this article you'll learn how you can use it in your login form. Login CSRF attacks are a bit less well-known. See `Forging Login Requests`_ if you're curious about more details. -Configuring CSRF ----------------- +Configuring CSRF Protection +--------------------------- First, configure the Security component so it can use CSRF protection. -The Security component needs a CSRF provider. You can set this to use the default +The Security component needs a CSRF token provider. You can set this to use the default provider available in the Form component: .. configuration-block:: From c35256614e85bdb910ef5c8ab4b9c335f7ed4043 Mon Sep 17 00:00:00 2001 From: adreeun Date: Sun, 27 Apr 2014 13:29:11 -0400 Subject: [PATCH 14/17] Update page_creation.rst Apache's directory index documentation link outdated - replaced <2.0> in the link with <2.4> --- book/page_creation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/page_creation.rst b/book/page_creation.rst index 05d0f61b533..f302f4250c1 100644 --- a/book/page_creation.rst +++ b/book/page_creation.rst @@ -1061,5 +1061,5 @@ to rapidly develop applications. .. _`Twig`: http://twig.sensiolabs.org .. _`third-party bundles`: http://knpbundles.com .. _`Symfony Standard Edition`: http://symfony.com/download -.. _`Apache's DirectoryIndex documentation`: http://httpd.apache.org/docs/2.0/mod/mod_dir.html +.. _`Apache's DirectoryIndex documentation`: http://httpd.apache.org/docs/2.4/mod/mod_dir.html .. _`Nginx HttpCoreModule location documentation`: http://wiki.nginx.org/HttpCoreModule#location From 4b8027e474670a32611d4b83fd3eeeb57d0d2add Mon Sep 17 00:00:00 2001 From: adreeun Date: Sun, 27 Apr 2014 14:56:36 -0400 Subject: [PATCH 15/17] Update page_creation.rst --- book/page_creation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/page_creation.rst b/book/page_creation.rst index f302f4250c1..b2b26c04c11 100644 --- a/book/page_creation.rst +++ b/book/page_creation.rst @@ -1061,5 +1061,5 @@ to rapidly develop applications. .. _`Twig`: http://twig.sensiolabs.org .. _`third-party bundles`: http://knpbundles.com .. _`Symfony Standard Edition`: http://symfony.com/download -.. _`Apache's DirectoryIndex documentation`: http://httpd.apache.org/docs/2.4/mod/mod_dir.html +.. _`Apache's DirectoryIndex documentation`: http://httpd.apache.org/docs/current/mod/mod_dir.html .. _`Nginx HttpCoreModule location documentation`: http://wiki.nginx.org/HttpCoreModule#location From ff14a69b9fa1a856f9fdd22b070ac6f9fa346b59 Mon Sep 17 00:00:00 2001 From: Delf Tonder Date: Mon, 28 Apr 2014 23:14:05 +0200 Subject: [PATCH 16/17] Update custom_authentication_provider.rst improved description of the getKey method --- cookbook/security/custom_authentication_provider.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/security/custom_authentication_provider.rst b/cookbook/security/custom_authentication_provider.rst index 42e3dbd3de4..f11e11aa32d 100644 --- a/cookbook/security/custom_authentication_provider.rst +++ b/cookbook/security/custom_authentication_provider.rst @@ -346,7 +346,7 @@ requires the following methods: and ``remember_me`` and defines the position at which the provider is called; * ``getKey`` method which defines the configuration key used to reference - the provider; + the provider in the firewall configuration; * ``addConfiguration`` method, which is used to define the configuration options underneath the configuration key in your security configuration. From 370dc5c433bf6f6d2bc9b5a1dc4993b64d29abd5 Mon Sep 17 00:00:00 2001 From: mimol91 Date: Tue, 29 Apr 2014 20:57:05 +0200 Subject: [PATCH 17/17] Update voters_data_permission.rst remove ContainerInterface --- cookbook/security/voters_data_permission.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/cookbook/security/voters_data_permission.rst b/cookbook/security/voters_data_permission.rst index 6646f4e8928..7e2db803b36 100644 --- a/cookbook/security/voters_data_permission.rst +++ b/cookbook/security/voters_data_permission.rst @@ -60,7 +60,6 @@ edit a particular object. Here's an example implementation:: namespace Acme\DemoBundle\Security\Authorization\Voter; use Symfony\Component\Security\Core\Exception\InvalidArgumentException; - use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\User\UserInterface;