Skip to content

Commit

Permalink
Merge branch '2.7' into 2.8
Browse files Browse the repository at this point in the history
Conflicts:
	components/serializer.rst
	debug/debugging.rst
  • Loading branch information
wouterj committed Oct 20, 2016
2 parents 982fdf8 + 67deef2 commit 12c3ec4
Show file tree
Hide file tree
Showing 12 changed files with 185 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .platform.app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ disk: 512
# Build time dependencies.
dependencies:
python:
sphinx: ">=1"
sphinx: "1.3.6"

# The hooks that will be performed when the package is deployed.
hooks:
Expand Down
1 change: 1 addition & 0 deletions _build/redirection_map
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,4 @@
/components/yaml/index /components/yaml
/deployment/tools /deployment
/install/bundles /setup/bundles
/form /forms
128 changes: 128 additions & 0 deletions changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,134 @@ documentation.
Do you also want to participate in the Symfony Documentation? Take a look
at the ":doc:`/contributing/documentation/overview`" article.

September, 2016
---------------

New Documentation
~~~~~~~~~~~~~~~~~

* `#6976 <https://github.com/symfony/symfony-docs/pull/6976>`_ [Finishing][Serializer] Document the encoders (Ener-Getick, weaverryan)

Fixed Documentation
~~~~~~~~~~~~~~~~~~~


Minor Documentation Changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~

* `#7016 <https://github.com/symfony/symfony-docs/pull/7016>`_ Add empty parentheses to method names (bocharsky-bw)
* `#7015 <https://github.com/symfony/symfony-docs/pull/7015>`_ Replace title placeholder name with slug (bocharsky-bw)
* `#7009 <https://github.com/symfony/symfony-docs/pull/7009>`_ Update form_dependencies.rst: fix DI (ReDnAxE)
* `#7010 <https://github.com/symfony/symfony-docs/pull/7010>`_ Update service_decoration.rst (lamari)
* `#6979 <https://github.com/symfony/symfony-docs/pull/6979>`_ Add specific tip about the http-kernel component (greg0ire)
* `#6686 <https://github.com/symfony/symfony-docs/pull/6686>`_ Update installation.rst (mgkimsal)
* `#7005 <https://github.com/symfony/symfony-docs/pull/7005>`_ Use new array syntax and make a few minor tweaks (bocharsky-bw)
* `#7004 <https://github.com/symfony/symfony-docs/pull/7004>`_ Tweak URL - CMF project moved to the other repo (bocharsky-bw)
* `#6999 <https://github.com/symfony/symfony-docs/pull/6999>`_ Several typo fixes (emirb)
* `#6997 <https://github.com/symfony/symfony-docs/pull/6997>`_ Update console.rst (adyassine)
* `#6917 <https://github.com/symfony/symfony-docs/pull/6917>`_ [Finder] document array use for locations (mickaelandrieu)
* `#6993 <https://github.com/symfony/symfony-docs/pull/6993>`_ Update create_custom_field_type.rst (yceruto)
* `#6995 <https://github.com/symfony/symfony-docs/pull/6995>`_ the least -> least (konrados)
* `#6934 <https://github.com/symfony/symfony-docs/pull/6934>`_ Update events.rst (asandjivy)
* `#6920 <https://github.com/symfony/symfony-docs/pull/6920>`_ [Config] Note about bundle priority for PrependExtensionInterface (wodor)
* `#6905 <https://github.com/symfony/symfony-docs/pull/6905>`_ Change example of ignoring dependencies for yaml (Integrity-178B)
* `#6885 <https://github.com/symfony/symfony-docs/pull/6885>`_ [FormComponent]Fix wrong mention in side note (rendler-denis)
* `#6911 <https://github.com/symfony/symfony-docs/pull/6911>`_ Article about logout. (BorodinDemid)
* `#6923 <https://github.com/symfony/symfony-docs/pull/6923>`_ Clarify by_reference use (jxmallett)
* `#6942 <https://github.com/symfony/symfony-docs/pull/6942>`_ Updated the "Build a Login Form" article (javiereguiluz)
* `#6933 <https://github.com/symfony/symfony-docs/pull/6933>`_ Misplaced paragraph about placeholders in routing.rst (antoin-m)
* `#6930 <https://github.com/symfony/symfony-docs/pull/6930>`_ Use Terminal lexer for console examples (wouterj)
* `#6893 <https://github.com/symfony/symfony-docs/pull/6893>`_ Update entity_provider.rst (asandjivy)
* `#6895 <https://github.com/symfony/symfony-docs/pull/6895>`_ fixing $formatLevelMap array values (zrashwani)
* `#6970 <https://github.com/symfony/symfony-docs/pull/6970>`_ Fix subject/verb agreement (micheal)
* `#6971 <https://github.com/symfony/symfony-docs/pull/6971>`_ Update composer.rst (TravisCarden)
* `#6983 <https://github.com/symfony/symfony-docs/pull/6983>`_ Update voters.rst (seferov)
* `#6986 <https://github.com/symfony/symfony-docs/pull/6986>`_ Fixed directory name typo (JoeThielen)
* `#6988 <https://github.com/symfony/symfony-docs/pull/6988>`_ fix link role syntax (xabbuh)
* `#6974 <https://github.com/symfony/symfony-docs/pull/6974>`_ Fix minor typo in security chapter How to Build a Traditional Login Form (peterkokot)
* `#6941 <https://github.com/symfony/symfony-docs/pull/6941>`_ Mentioned the "Symfony Upgrade Fixer" in the upgrade article (javiereguiluz)
* `#6936 <https://github.com/symfony/symfony-docs/pull/6936>`_ Improved the title of Validation Groups article to make it easier to find (javiereguiluz)
* `#6964 <https://github.com/symfony/symfony-docs/pull/6964>`_ Fix typo in validator example (svenluijten)
* `#6945 <https://github.com/symfony/symfony-docs/pull/6945>`_ Fixed indentation issues in alias_private article (javiereguiluz)
* `#6955 <https://github.com/symfony/symfony-docs/pull/6955>`_ Typo in the class name. (pythagor)


August, 2016
------------

New Documentation
~~~~~~~~~~~~~~~~~

* `#6765 <https://github.com/symfony/symfony-docs/pull/6765>`_ [Contributing] [Standards] Do not use spaces inside/around offset accessors (phansys)
* `#6746 <https://github.com/symfony/symfony-docs/pull/6746>`_ Removing the alias stuff - not required after symfony/symfony#17074 (weaverryan)
* `#6798 <https://github.com/symfony/symfony-docs/pull/6798>`_ Finishing Validator Docs (wouterj, mickaelandrieu, javiereguiluz, weaverryan)

Fixed Documentation
~~~~~~~~~~~~~~~~~~~

* `#6915 <https://github.com/symfony/symfony-docs/pull/6915>`_ Fix the error in code example (kruglikov)
* `#6907 <https://github.com/symfony/symfony-docs/pull/6907>`_ fix wrong variable name in OptionsResolver example (dincho)
* `#6904 <https://github.com/symfony/symfony-docs/pull/6904>`_ Update create_custom_field_type.rst (tuanalumi)
* `#6884 <https://github.com/symfony/symfony-docs/pull/6884>`_ service_container : fix php Definition instance (ReDnAxE)
* `#6883 <https://github.com/symfony/symfony-docs/pull/6883>`_ [Routing] Fix a route path in a routing example (thomasbisignani)
* `#6869 <https://github.com/symfony/symfony-docs/pull/6869>`_ Update templating.rst (asandjivy)
* `#6822 <https://github.com/symfony/symfony-docs/pull/6822>`_ Adjust Application use statement (kvdnberg)
* `#6881 <https://github.com/symfony/symfony-docs/pull/6881>`_ Error in CSRF example code snippet (makoru-hikage)
* `#6848 <https://github.com/symfony/symfony-docs/pull/6848>`_ Fix Varnish 4 code example (Dreimus)
* `#6845 <https://github.com/symfony/symfony-docs/pull/6845>`_ Fixed the extension of a logging article (javiereguiluz)
* `#6800 <https://github.com/symfony/symfony-docs/pull/6800>`_ Fix missing function name (JosefVitu)
* `#6843 <https://github.com/symfony/symfony-docs/pull/6843>`_ fix index directive syntax (xabbuh)
* `#6784 <https://github.com/symfony/symfony-docs/pull/6784>`_ Fix CS for form templates locations (javiereguiluz)
* `#6797 <https://github.com/symfony/symfony-docs/pull/6797>`_ fix FlattenException namespace (alchimik)
* `#6787 <https://github.com/symfony/symfony-docs/pull/6787>`_ Fix reference to output object (micheal)
* `#6757 <https://github.com/symfony/symfony-docs/pull/6757>`_ Fix typo in external_parameters.rst (gmorel)
* `#6754 <https://github.com/symfony/symfony-docs/pull/6754>`_ Add missing use statements to data collector example (richardmiller)

Minor Documentation Changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~

* `#6921 <https://github.com/symfony/symfony-docs/pull/6921>`_ Fix var_dumper advanced usage link (ogizanagi)
* `#6913 <https://github.com/symfony/symfony-docs/pull/6913>`_ [Controller Description] Fix typos and class link (rendler-denis)
* `#6909 <https://github.com/symfony/symfony-docs/pull/6909>`_ DumpFile() third argument is deprecated and doesn't exists anymore (mickaelandrieu)
* `#6901 <https://github.com/symfony/symfony-docs/pull/6901>`_ [EventDispatcher] paragraph duplicated (ReDnAxE)
* `#6899 <https://github.com/symfony/symfony-docs/pull/6899>`_ Update access_control.rst (asandjivy)
* `#6898 <https://github.com/symfony/symfony-docs/pull/6898>`_ Fixes after tonight's merge round (wouterj)
* `#6849 <https://github.com/symfony/symfony-docs/pull/6849>`_ Link to inversedBy/mappedBy documentation (soulchainer, wouterj)
* `#6846 <https://github.com/symfony/symfony-docs/pull/6846>`_ Adds bin folder creation instruction (joelrfcosta)
* `#6835 <https://github.com/symfony/symfony-docs/pull/6835>`_ Updated the instructions to build docs locally (javiereguiluz)
* 5a5720fe minor #6834 Refactored how to get the container in a test (javiereguiluz)
* `#6814 <https://github.com/symfony/symfony-docs/pull/6814>`_ Created the main article about "deployment" (javiereguiluz)
* `#6882 <https://github.com/symfony/symfony-docs/pull/6882>`_ Update serializer.rst (seferov)
* `#6880 <https://github.com/symfony/symfony-docs/pull/6880>`_ Remove extra quotes from ExprBuilder::thenInvalid() usage (chalasr)
* `#6878 <https://github.com/symfony/symfony-docs/pull/6878>`_ missing "`" (jevgenijusr)
* `#6877 <https://github.com/symfony/symfony-docs/pull/6877>`_ added lyrixx to the core team (fabpot)
* `#6867 <https://github.com/symfony/symfony-docs/pull/6867>`_ Add a class specificity for SplFileInfo text (rendler-denis)
* `#6872 <https://github.com/symfony/symfony-docs/pull/6872>`_ Remove redundant verb (julienfalque)
* `#6866 <https://github.com/symfony/symfony-docs/pull/6866>`_ Deprecated message with "true" parameter (wazz42)
* `#6862 <https://github.com/symfony/symfony-docs/pull/6862>`_ Remove unused JsonResponse dependency in example (Farskies)
* `#6855 <https://github.com/symfony/symfony-docs/pull/6855>`_ [Form] Use composer require instead of modifying composer.json (wouterj)
* `#6853 <https://github.com/symfony/symfony-docs/pull/6853>`_ Logrotate moved to GitHub (wouterj)
* `#6851 <https://github.com/symfony/symfony-docs/pull/6851>`_ Update lazy_services.rst (takeit)
* `#6794 <https://github.com/symfony/symfony-docs/pull/6794>`_ Added a new section to the page templating/global_vars using a EVListener (piet, Piet Bijl)
* `#6824 <https://github.com/symfony/symfony-docs/pull/6824>`_ Service naming convension (orions)
* `#6829 <https://github.com/symfony/symfony-docs/pull/6829>`_ Fix a typo in an HTTP Cache code example (aybbou)
* `#6833 <https://github.com/symfony/symfony-docs/pull/6833>`_ Fixed a syntax issue in custom_constraint article (javiereguiluz)
* `#6842 <https://github.com/symfony/symfony-docs/pull/6842>`_ Fixed service name (jeremyFreeAgent)
* `#6803 <https://github.com/symfony/symfony-docs/pull/6803>`_ Remove complex speech pattern (micheal)
* `#6805 <https://github.com/symfony/symfony-docs/pull/6805>`_ Remove colloquialism "hold on" (micheal)
* `#6796 <https://github.com/symfony/symfony-docs/pull/6796>`_ Remove AcmeDemoBundle references (michaelcullum)
* `#6786 <https://github.com/symfony/symfony-docs/pull/6786>`_ Subject-verb agreement (micheal)
* `#6759 <https://github.com/symfony/symfony-docs/pull/6759>`_ Fix tense and sentence length (aalaap)
* `#6820 <https://github.com/symfony/symfony-docs/pull/6820>`_ Fixed the main index page redirections (javiereguiluz)
* `#6819 <https://github.com/symfony/symfony-docs/pull/6819>`_ Fixed the redirection for "upgrade" articles (javiereguiluz)
* `#6812 <https://github.com/symfony/symfony-docs/pull/6812>`_ Fixed a Console article redirection (javiereguiluz)
* `#6807 <https://github.com/symfony/symfony-docs/pull/6807>`_ Fixed the redirection of the cookbook/psr7 article (javiereguiluz)
* `#6806 <https://github.com/symfony/symfony-docs/pull/6806>`_ Fixed the redirection of some cache articles (javiereguiluz)
* `#6808 <https://github.com/symfony/symfony-docs/pull/6808>`_ Fixed a DI redirection (javiereguiluz)
* `#6810 <https://github.com/symfony/symfony-docs/pull/6810>`_ Fixed the redirection of the previous "performance" book chapter (javiereguiluz)
* `#6816 <https://github.com/symfony/symfony-docs/pull/6816>`_ Added all the missing "index pages" redirections (javiereguiluz)


July, 2016
----------

Expand Down
10 changes: 5 additions & 5 deletions components/serializer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -674,11 +674,6 @@ you indicate that you're expecting an array instead of a single object.
$data = ...; // The serialized data from the previous example
$persons = $serializer->deserialize($data, 'Acme\Person[]', 'json');
.. seealso::

A popular alternative to the Symfony Serializer Component is the third-party
library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).

Learn more
----------

Expand All @@ -688,5 +683,10 @@ Learn more

/serializer

.. seealso::

A popular alternative to the Symfony Serializer Component is the third-party
library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).

.. _`JMS serializer`: https://github.com/schmittjoh/serializer
.. _Packagist: https://packagist.org/packages/symfony/serializer
4 changes: 2 additions & 2 deletions console/commands_as_services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ with ``console.command``:
app.command.my_command:
class: AppBundle\Command\MyCommand
tags:
- { name: console.command }
- { name: console.command }
.. code-block:: xml
Expand Down Expand Up @@ -137,7 +137,7 @@ inject the ``command.default_name`` parameter:
class: AppBundle\Command\MyCommand
arguments: ["%command.default_name%"]
tags:
- { name: console.command }
- { name: console.command }
.. code-block:: xml
Expand Down
34 changes: 32 additions & 2 deletions debug/debugging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,35 @@ statements like below::
session.

Some IDEs do not like the fact that some classes are stored in different
locations. To avoid problems, you can tell your IDE to ignore the PHP cache
file.
locations. To avoid problems, you can either tell your IDE to ignore the PHP
cache files, or you can change the extension used by Symfony for these files::

$kernel->loadClassCache('classes', '.php.cache');

Useful Debugging Commands
-------------------------

When developing a large application, it can be hard to keep track of all the
different services, routes and translations. Luckily, Symfony has some commands
that can help you visualize and find the information.

``debug:container``
Displays information about the contents of the Symfony container for all public
services. To find only those matching a name, append the name as an argument.

``debug:config``
Shows all configured bundles, their class and their alias.

``debug:router``
Displays information about all configured routes in the application as a
table with the name, method, scheme, host and path for each route.

``debug:translation <locale>``
Shows a table of the translation key, the domain, the translation and the
fallback translation for all known messages, if translations exist for
the given locale.

.. tip::

When in doubt how to use a console command, open the help section by
appending the ``--help`` option.
2 changes: 1 addition & 1 deletion doctrine/common_extensions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ To do this, you have two options:
with Symfony: `Install Gedmo Doctrine2 extensions in Symfony2`_

.. _`DoctrineExtensions`: https://github.com/Atlantic18/DoctrineExtensions
.. _`StofDoctrineExtensionsBundle`: https://github.com/stof/StofDoctrineExtensionsBundle
.. _`StofDoctrineExtensionsBundle`: http://symfony.com/doc/master/bundles/StofDoctrineExtensionsBundle/index.html
.. _`Sluggable`: https://github.com/Atlantic18/DoctrineExtensions/blob/master/doc/sluggable.md
.. _`Translatable`: https://github.com/Atlantic18/DoctrineExtensions/blob/master/doc/translatable.md
.. _`Timestampable`: https://github.com/Atlantic18/DoctrineExtensions/blob/master/doc/timestampable.md
Expand Down
8 changes: 8 additions & 0 deletions reference/twig_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@ Returns the relative URL (without the scheme and host) for the given route.
If ``relative`` is enabled, it'll create a path relative to the current
path. More information in :ref:`templating-pages`.

.. seealso::

Read :doc:`/routing` to learn more about the Routing component.

url
~~~

Expand All @@ -360,6 +364,10 @@ Returns the absolute URL (with scheme and host) for the given route. If
``schemeRelative`` is enabled, it'll create a scheme-relative URL. More
information in :ref:`templating-pages`.

.. seealso::

Read :doc:`/routing` to learn more about the Routing component.

absolute_url
~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion security/remember_me.rst
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ your controller using annotations:
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
/**
* @Security("has_role('IS_AUTHENTICATED_FULLY')")
* @Security("is_granted('IS_AUTHENTICATED_FULLY')")
*/
public function editAction($name)
{
Expand Down
2 changes: 1 addition & 1 deletion security/securing_services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ the :ref:`sidebar <securing-services-annotations-sidebar>` below):
newsletter_manager:
class: AppBundle\Newsletter\NewsletterManager
tags:
- { name: security.secure_service }
- { name: security.secure_service }
.. code-block:: xml
Expand Down
10 changes: 5 additions & 5 deletions service_container/tags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ to be used for a specific purpose. Take the following example:
class: AppBundle\Extension\FooExtension
public: false
tags:
- { name: twig.extension }
- { name: twig.extension }
.. code-block:: xml
Expand Down Expand Up @@ -146,12 +146,12 @@ For example, you may add the following transports as services:
class: \Swift_SmtpTransport
arguments: ['%mailer_host%']
tags:
- { name: app.mail_transport }
- { name: app.mail_transport }
app.sendmail_transport:
class: \Swift_SendmailTransport
tags:
- { name: app.mail_transport }
- { name: app.mail_transport }
.. code-block:: xml
Expand Down Expand Up @@ -299,12 +299,12 @@ To answer this, change the service declaration:
class: \Swift_SmtpTransport
arguments: ['%mailer_host%']
tags:
- { name: app.mail_transport, alias: foo }
- { name: app.mail_transport, alias: foo }
app.sendmail_transport:
class: \Swift_SendmailTransport
tags:
- { name: app.mail_transport, alias: bar }
- { name: app.mail_transport, alias: bar }
.. code-block:: xml
Expand Down
4 changes: 0 additions & 4 deletions setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ executable that needs to be installed on your system only once:
# Linux and macOS systems
$ sudo mkdir -p /usr/local/bin
some
output
stuff
$ sudo curl -LsS https://symfony.com/installer -o /usr/local/bin/symfony
$ sudo chmod a+x /usr/local/bin/symfony
Expand Down

0 comments on commit 12c3ec4

Please sign in to comment.