Skip to content

Commit

Permalink
Merge branch '2.7' into 2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
xabbuh committed Sep 23, 2015
2 parents 8d66137 + 89814fb commit 6a01917
Show file tree
Hide file tree
Showing 32 changed files with 57 additions and 57 deletions.
2 changes: 1 addition & 1 deletion book/forms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1953,7 +1953,7 @@ Learn more from the Cookbook
* :doc:`/cookbook/security/csrf_in_login_form`
* :doc:`/cookbook/cache/form_csrf_caching`

.. _`Symfony Form component`: https://github.com/symfony/Form
.. _`Symfony Form component`: https://github.com/symfony/form
.. _`DateTime`: http://php.net/manual/en/class.datetime.php
.. _`Twig Bridge`: https://github.com/symfony/symfony/tree/master/src/Symfony/Bridge/Twig
.. _`form_div_layout.html.twig`: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
Expand Down
4 changes: 2 additions & 2 deletions book/from_flat_php_to_symfony2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -757,8 +757,8 @@ Learn more from the Cookbook

.. _`Doctrine`: http://www.doctrine-project.org
.. _`download Composer`: https://getcomposer.org/download/
.. _`Routing`: https://github.com/symfony/Routing
.. _`Templating`: https://github.com/symfony/Templating
.. _`Routing`: https://github.com/symfony/routing
.. _`Templating`: https://github.com/symfony/templating
.. _`KnpBundles.com`: http://knpbundles.com/
.. _`Twig`: http://twig.sensiolabs.org
.. _`Varnish`: https://www.varnish-cache.org/
Expand Down
2 changes: 1 addition & 1 deletion book/http_fundamentals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -579,5 +579,5 @@ sensible defaults. For more advanced users, the sky is the limit.
.. _`List of HTTP status codes`: https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
.. _`List of HTTP header fields`: https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
.. _`List of common media types`: https://www.iana.org/assignments/media-types/media-types.xhtml
.. _`Validator`: https://github.com/symfony/Validator
.. _`Validator`: https://github.com/symfony/validator
.. _`Swift Mailer`: http://swiftmailer.org/
2 changes: 1 addition & 1 deletion book/validation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1300,5 +1300,5 @@ Learn more from the Cookbook

* :doc:`/cookbook/validation/custom_constraint`

.. _Validator: https://github.com/symfony/Validator
.. _Validator: https://github.com/symfony/validator
.. _JSR303 Bean Validation specification: http://jcp.org/en/jsr/detail?id=303
2 changes: 1 addition & 1 deletion components/asset/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Installation
You can install the component in two different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/asset`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Asset).
* Use the official Git repository (https://github.com/symfony/asset).

Usage
-----
Expand Down
2 changes: 1 addition & 1 deletion components/class_loader/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/class-loader``
on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/ClassLoader).
* Use the official Git repository (https://github.com/symfony/class-loader).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/config/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/config``
on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Config).
* Use the official Git repository (https://github.com/symfony/config).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/console/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/console`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Console).
* Use the official Git repository (https://github.com/symfony/console).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/css_selector.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/css-selector`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/CssSelector).
* Use the official Git repository (https://github.com/symfony/css-selector).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/debug/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Installation
You can install the component in many different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/debug`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Debug).
* Use the official Git repository (https://github.com/symfony/debug).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/dependency_injection/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/dependency-injection``
on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/DependencyInjection).
* Use the official Git repository (https://github.com/symfony/dependency-injection).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/dom_crawler.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/dom-crawler`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/DomCrawler).
* Use the official Git repository (https://github.com/symfony/dom-crawler).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/event_dispatcher/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>`
(``symfony/event-dispatcher`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/EventDispatcher).
* Use the official Git repository (https://github.com/symfony/event-dispatcher).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/expression_language/caching.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ Both ``evaluate()`` and ``compile()`` can handle ``ParsedExpression`` and
var_dump($language->evaluate($expression)); // prints 5
.. _DoctrineBridge: https://github.com/symfony/DoctrineBridge
.. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
.. _`doctrine cache library`: http://docs.doctrine-project.org/projects/doctrine-common/en/latest/reference/caching.html
2 changes: 1 addition & 1 deletion components/filesystem/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/filesystem`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Filesystem).
* Use the official Git repository (https://github.com/symfony/filesystem).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/finder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/finder`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Finder).
* Use the official Git repository (https://github.com/symfony/finder).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/form/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/form`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Form).
* Use the official Git repository (https://github.com/symfony/form).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/http_foundation/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/http-foundation`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/HttpFoundation).
* Use the official Git repository (https://github.com/symfony/http-foundation).

.. include:: /components/require_autoload.rst.inc

Expand Down
4 changes: 2 additions & 2 deletions components/http_kernel/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/http-kernel`` on Packagist_);
* Use the official Git repository (https://github.com/symfony/HttpKernel).
* Use the official Git repository (https://github.com/symfony/http-kernel).

.. include:: /components/require_autoload.rst.inc

Expand Down Expand Up @@ -712,4 +712,4 @@ look like this::
.. _`SensioFrameworkExtraBundle`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
.. _`@ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
.. _`@Template`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/view.html
.. _`EmailSenderListener`: https://github.com/symfony/SwiftmailerBundle/blob/master/EventListener/EmailSenderListener.php
.. _`EmailSenderListener`: https://github.com/symfony/swiftmailer-bundle/blob/master/EventListener/EmailSenderListener.php
2 changes: 1 addition & 1 deletion components/intl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Installation
You can install the component in two different ways:

* :doc:`Install it via Composer</components/using_components>` (``symfony/intl`` on `Packagist`_);
* Using the official Git repository (https://github.com/symfony/Intl).
* Using the official Git repository (https://github.com/symfony/intl).

If you install the component via Composer, the following classes and functions
of the intl extension will be automatically provided if the intl extension is
Expand Down
2 changes: 1 addition & 1 deletion components/options_resolver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/options-resolver`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/OptionsResolver).
* Use the official Git repository (https://github.com/symfony/options-resolver).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/process`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Process).
* Use the official Git repository (https://github.com/symfony/process).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/property_access/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Installation
You can install the component in two different ways:

* :doc:`Install it via Composer</components/using_components>` (``symfony/property-access`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/PropertyAccess).
* Use the official Git repository (https://github.com/symfony/property-access).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/routing/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/routing`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Routing).
* Use the official Git repository (https://github.com/symfony/routing).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/security/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/security`` on Packagist_);
* Use the official Git repository (https://github.com/symfony/Security).
* Use the official Git repository (https://github.com/symfony/security).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/serializer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/serializer`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Serializer).
* Use the official Git repository (https://github.com/symfony/serializer).


.. include:: /components/require_autoload.rst.inc
Expand Down
2 changes: 1 addition & 1 deletion components/stopwatch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Installation
You can install the component in two different ways:

* :doc:`Install it via Composer</components/using_components>` (``symfony/stopwatch`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Stopwatch).
* Use the official Git repository (https://github.com/symfony/stopwatch).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/templating/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/templating`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Templating).
* Use the official Git repository (https://github.com/symfony/templating).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/translation/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/translation`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Translation).
* Use the official Git repository (https://github.com/symfony/translation).

.. include:: /components/require_autoload.rst.inc

Expand Down
2 changes: 1 addition & 1 deletion components/yaml/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Installation
You can install the component in 2 different ways:

* :doc:`Install it via Composer </components/using_components>` (``symfony/yaml`` on `Packagist`_);
* Use the official Git repository (https://github.com/symfony/Yaml).
* Use the official Git repository (https://github.com/symfony/yaml).

.. include:: /components/require_autoload.rst.inc

Expand Down
48 changes: 24 additions & 24 deletions contributing/code/core_team.rst
Original file line number Diff line number Diff line change
Expand Up @@ -149,30 +149,30 @@ discretion of the **Project Leader**.
.. [1] Minor changes comprise typos, DocBlock fixes, code standards
violations, and minor CSS, JavaScript and HTML modifications.
.. _BrowserKit: https://github.com/symfony/BrowserKit
.. _Config: https://github.com/symfony/Config
.. _Console: https://github.com/symfony/Console
.. _Debug: https://github.com/symfony/Debug
.. _DependencyInjection: https://github.com/symfony/DependencyInjection
.. _DoctrineBridge: https://github.com/symfony/DoctrineBridge
.. _EventDispatcher: https://github.com/symfony/EventDispatcher
.. _DomCrawler: https://github.com/symfony/DomCrawler
.. _Form: https://github.com/symfony/Form
.. _HttpFoundation: https://github.com/symfony/HttpFoundation
.. _HttpKernel: https://github.com/symfony/HttpKernel
.. _Icu: https://github.com/symfony/Icu
.. _Intl: https://github.com/symfony/Intl
.. _Locale: https://github.com/symfony/Locale
.. _MonologBridge: https://github.com/symfony/MonologBridge
.. _OptionsResolver: https://github.com/symfony/OptionsResolver
.. _Process: https://github.com/symfony/Process
.. _PropertyAccess: https://github.com/symfony/PropertyAccess
.. _Routing: https://github.com/symfony/Routing
.. _Serializer: https://github.com/symfony/Serializer
.. _Translation: https://github.com/symfony/Translation
.. _Stopwatch: https://github.com/symfony/Stopwatch
.. _TwigBridge: https://github.com/symfony/TwigBridge
.. _Validator: https://github.com/symfony/Validator
.. _BrowserKit: https://github.com/symfony/browser-kit
.. _Config: https://github.com/symfony/config
.. _Console: https://github.com/symfony/console
.. _Debug: https://github.com/symfony/debug
.. _DependencyInjection: https://github.com/symfony/dependency-injection
.. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
.. _EventDispatcher: https://github.com/symfony/event-dispatcher
.. _DomCrawler: https://github.com/symfony/dom-crawler
.. _Form: https://github.com/symfony/form
.. _HttpFoundation: https://github.com/symfony/http-foundation
.. _HttpKernel: https://github.com/symfony/http-kernel
.. _Icu: https://github.com/symfony/icu
.. _Intl: https://github.com/symfony/intl
.. _Locale: https://github.com/symfony/locale
.. _MonologBridge: https://github.com/symfony/monolog-bridge
.. _OptionsResolver: https://github.com/symfony/options-resolver
.. _Process: https://github.com/symfony/process
.. _PropertyAccess: https://github.com/symfony/property-access
.. _Routing: https://github.com/symfony/routing
.. _Serializer: https://github.com/symfony/serializer
.. _Translation: https://github.com/symfony/translation
.. _Stopwatch: https://github.com/symfony/stopwatch
.. _TwigBridge: https://github.com/symfony/twig-bridge
.. _Validator: https://github.com/symfony/validator
.. _VarDumper: https://github.com/symfony/var-dumper
.. _DebugBundle: https://github.com/symfony/debug-bundle
.. _`fabpot`: https://github.com/fabpot/
Expand Down
2 changes: 1 addition & 1 deletion reference/events.rst
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,4 @@ Listener Class Name Prior
:class:`Symfony\\Component\\HttpKernel\\EventListener\\ExceptionListener` -128
========================================================================= ========

.. _`EmailSenderListener`: https://github.com/symfony/SwiftmailerBundle/blob/master/EventListener/EmailSenderListener.php
.. _`EmailSenderListener`: https://github.com/symfony/swiftmailer-bundle/blob/master/EventListener/EmailSenderListener.php

0 comments on commit 6a01917

Please sign in to comment.