Merge branch '3.4'

weaverryan · weaverryan · commit 47024b41588e · 2017-06-12T22:30:43.000-04:00
* 3.4: Adding missing the Fix autoescape_service example Proofread encore Fixed typo in Encore/Shared-Entry page Add missing argument to code example Fix some typos align travis and platform build environments Fix some typos Adding header to separate sections Adding missing workflow.entered events Create tags.rst Update tags.rst Fixed app/config/services.yml link Minor reword of the intro of the routing/conditions article Minor reword for the intro of the Templating article Fixed indentation in a configuration block Update LessThan.rst "Basic Usage" part Fix typo minor #7999 Small grammatical improvement (catchamonkey) [DI] Automatically applying a tag to all services implementing an interface
diff --git a/.platform.app.yaml b/.platform.app.yaml
@@ -57,4 +57,5 @@ hooks:
       export PIP_USER=
       pip install pip==9.0.1 wheel==0.29.0
       pip install -r _build/.requirements.txt
+      find .virtualenv -type f -name "*.rst" -delete
       make -C _build html
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,9 @@ sudo: false
 cache:
   directories: [$HOME/.cache/pip]
 
-install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
+install: pip install -r _build/.requirements.txt
 
-script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
+script: make -C _build SPHINXOPTS=-nW html
 
 branches:
   except:
diff --git a/_build/.requirements.txt b/_build/.requirements.txt
@@ -1,14 +1,13 @@
-alabaster==0.7.9
-Babel==2.3.4
+alabaster==0.7.10
+Babel==2.4.0
 docutils==0.13.1
 imagesize==0.7.1
-Jinja2==2.9.4
-MarkupSafe==0.23
+Jinja2==2.9.6
+MarkupSafe==1.0
 Pygments==2.2.0
-pytz==2016.10
+pytz==2017.2
 requests==2.12.5
 six==1.10.0
 snowballstemmer==1.2.1
-Sphinx==1.5.2
+Sphinx==1.3.6
 git+https://github.com/fabpot/sphinx-php.git@7312eccce9465640752e51373a480da700e02345#egg_name=sphinx-php
-
diff --git a/frontend.rst b/frontend.rst
@@ -62,13 +62,8 @@ Full API
 
 * `Full API`_: https://github.com/symfony/webpack-encore/blob/master/index.js
 
-.. _`Webpack Encore`: https://www.npmjs.com/package/@symfony/webpack-encore
-.. _`Webpack`: https://webpack.js.org/
-.. _`Webpacker`: https://github.com/rails/webpacker
-.. _`Mix`: https://laravel.com/docs/5.4/mix
-.. _`Symfony`: http://symfony.com/
-.. _`Full API`: https://github.com/symfony/webpack-encore/blob/master/index.js
-
+Other Front-End Articles
+........................
 
 .. toctree::
     :maxdepth: 1
@@ -81,3 +76,10 @@ Full API
     :glob:
 
     frontend/encore/*
+
+.. _`Webpack Encore`: https://www.npmjs.com/package/@symfony/webpack-encore
+.. _`Webpack`: https://webpack.js.org/
+.. _`Webpacker`: https://github.com/rails/webpacker
+.. _`Mix`: https://laravel.com/docs/5.4/mix
+.. _`Symfony`: http://symfony.com/
+.. _`Full API`: https://github.com/symfony/webpack-encore/blob/master/index.js
diff --git a/frontend/encore/bootstrap.rst b/frontend/encore/bootstrap.rst
@@ -13,7 +13,7 @@ Importing Bootstrap Sass
 ------------------------
 
 Now that ``bootstrap-sass`` lives in your ``node_modules`` directory, you can
-import it from any Sass or JavaScript file. For example, if you're already have
+import it from any Sass or JavaScript file. For example, if you already have
 a ``global.scss`` file, import it from there:
 
 .. code-block:: css
@@ -71,7 +71,7 @@ Bootstrap JavaScript requires jQuery, so make sure you have this installed:
 
     $ yarn add jquery --dev
 
-Next, make sure call ``.autoProvidejQuery()`` in your ``webpack.config.js`` file:
+Next, make sure to call ``.autoProvidejQuery()`` in your ``webpack.config.js`` file:
 
 .. code-block:: diff
 
diff --git a/frontend/encore/cdn.rst b/frontend/encore/cdn.rst
@@ -36,7 +36,7 @@ e.g. ``https://my-cool-app.com.global.prod.fastly.net/dashboard.js``.
     directly from your web server.
 
 You *do* need to make sure that the ``script`` and ``link`` tags you include on your
-pages also uses the CDN. Fortunately, the ``manifest.json`` paths are updated to
+pages also use the CDN. Fortunately, the ``manifest.json`` paths are updated to
 point to the CDN. In Symfony, as long as you've configured
 :doc:`Asset Versioning </frontend/encore/versioning>`, you're done! The ``manifest.json``
 file includes the full CDN URL:
diff --git a/frontend/encore/css-preprocessors.rst b/frontend/encore/css-preprocessors.rst
@@ -1,5 +1,5 @@
-CSS Preprocessors: Sass, LESS, etc
-==================================
+CSS Preprocessors: Sass, LESS, etc.
+===================================
 
 Using Sass
 ----------
@@ -22,7 +22,7 @@ And enable it in ``webpack.config.js``:
         .enableSassLoader()
     ;
 
-That's it! All files ending in ``.sass`` or ``.scss`` will be processed.
+That's it! All files ending in ``.sass`` or ``.scss`` will be pre-processed.
 
 Using LESS
 ----------
diff --git a/frontend/encore/dev-server.rst b/frontend/encore/dev-server.rst
@@ -1,7 +1,7 @@
 Using webpack-dev-server and HMR
 ================================
 
-While developing, instead of using ``encore dev --watch``, you can instead use the
+While developing, instead of using ``encore dev --watch``, you can use the
 `webpack-dev-server`_:
 
 .. code-block:: terminal
diff --git a/frontend/encore/page-specific-assets.rst b/frontend/encore/page-specific-assets.rst
@@ -28,7 +28,7 @@ tag for ``checkout.css`` if you import any CSS).
 Multiple Entries Per Page?
 --------------------------
 
-Typically, you should include only *one* entry JavaScript per page. This means
+Typically, you should include only *one* JavaScript entry per page. This means
 the checkout page will include ``checkout.js``, but will *not* include the
 ``app.js`` that's used on the other pages. Think of the checkout page as its
 own "app", where ``checkout.js`` includes all the functionality you need.
diff --git a/frontend/encore/server-data.rst b/frontend/encore/server-data.rst
@@ -26,7 +26,7 @@ Fetch this in JavaScript:
 There is no size limit for the value of the ``data-`` attributes, so you can
 store any content. In Twig, use the ``html_attr`` escaping strategy to avoid messing
 with HTML attributes. For example, if your ``User`` object has some ``getProfileData()``
-method that returns an array, you could:
+method that returns an array, you could do the following:
 
 .. code-block:: twig
 
diff --git a/frontend/encore/shared-entry.rst b/frontend/encore/shared-entry.rst
@@ -10,8 +10,8 @@ that's included on every page:
 
     Encore
         // ...
-        .addEntry('page1', 'asssets/js/page1.js')
-        .addEntry('page2', 'asssets/js/page2.js')
+        .addEntry('page1', 'assets/js/page1.js')
+        .addEntry('page2', 'assets/js/page2.js')
 
         // this creates a 'vendor.js' file with jquery and the bootstrap JS module
         // these modules will *not* be included in page1.js or page2.js anymore
diff --git a/frontend/encore/simple-example.rst b/frontend/encore/simple-example.rst
@@ -40,7 +40,7 @@ Inside, use Encore to help generate your Webpack configuration.
         // allow sass/scss files to be processed
         .enableSassLoader()
 
-        // allows legacy applications to use $/jQuery as a global variable
+        // allow legacy applications to use $/jQuery as a global variable
         .autoProvidejQuery()
 
         .enableSourceMaps(!Encore.isProduction())
@@ -99,7 +99,7 @@ In Symfony, use the ``asset()`` helper:
 Requiring JavaScript Modules
 ----------------------------
 
-Webpack is module bundler... which means that you can ``require`` other JavaScript
+Webpack is a module bundler... which means that you can ``require`` other JavaScript
 files. First, create a file that exports a function:
 
 .. code-block:: javascript
@@ -128,8 +128,8 @@ Great! Use ``require()`` to import ``jquery`` and ``greet.js``:
     // ./ (or ../) means to look for a local file
     var greet = require('./greet');
 
-    $(document).ready(function()) {
-        $('h1').html(greet());
+    $(document).ready(function() {
+        $('h1').html(greet('john'));
     });
 
 That's it! When you build your assets, jQuery and ``greet.js`` will automatically
diff --git a/frontend/encore/sourcemaps.rst b/frontend/encore/sourcemaps.rst
@@ -1,7 +1,7 @@
 Enabling Source Maps
 ====================
 
-`Source maps`_ allow browsers to access to the original code related to some
+`Source maps`_ allow browsers to access the original code related to some
 asset (e.g. the Sass code that was compiled to CSS or the TypeScript code that
 was compiled to JavaScript). Source maps are useful for debugging purposes but
 unnecessary when executing the application in production.
diff --git a/frontend/encore/versioning.rst b/frontend/encore/versioning.rst
@@ -8,7 +8,7 @@ By calling ``enableVersioning()``, each filename will now include a hash that
 changes whenever the *contents* of that file change (e.g. ``app.123abc.js``
 instead of ``app.js``). This allows you to use aggressive caching strategies
 (e.g. a far future ``Expires``) because, whenever a file change, its hash will change,
-invalidating any existing cache:
+ignoring any existing cache:
 
 .. code-block:: diff
 
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -43,7 +43,7 @@ TwigBundle Configuration ("twig")
             autoescape:                ~
 
             # See http://twig.sensiolabs.org/doc/recipes.html#using-the-template-name-to-set-the-default-escaping-strategy
-            autoescape_service:        ~ # Example: '@my_service'
+            autoescape_service:        ~ # Example: 'my_service'
             autoescape_service_method: ~ # use in combination with autoescape_service option
             base_template_class:       ~ # Example: Twig_Template
             cache:                     '%kernel.cache_dir%/twig'
diff --git a/reference/constraints/LessThan.rst b/reference/constraints/LessThan.rst
@@ -23,8 +23,8 @@ Basic Usage
 
 The following constraints ensure that:
 
-* the number of ``siblings`` of a ``Person`` is less than or equal to ``5``
-* ``age`` is less than``80``
+* the number of ``siblings`` of a ``Person`` is less than ``5``
+* ``age`` is less than ``80``
 
 .. configuration-block::
 
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
@@ -126,12 +126,12 @@ set for the package and the URL path. More information in
 :ref:`templating-assets`. For asset versioning, see
 :ref:`reference-framework-assets-version`.
 
-assets_version
+asset_version
 ~~~~~~~~~~~~~~
 
 .. code-block:: twig
 
-    {{ assets_version(packageName = null) }}
+    {{ asset_version(packageName = null) }}
 
 ``packageName`` *(optional)*
     **type**: ``string`` | ``null`` **default**: ``null``
diff --git a/routing/conditions.rst b/routing/conditions.rst
@@ -4,9 +4,9 @@
 How to Restrict Route Matching through Conditions
 =================================================
 
-As you've seen, a route can be made to match only certain routing wildcards
-(via regular expressions), HTTP methods, or host names. But the routing system
-can be extended to have an almost infinite flexibility using ``conditions``:
+A route can be made to match only certain routing placeholders (via regular
+expressions), HTTP methods, or host names. If you need more flexibility to
+define arbitrary matching logic, use the ``conditions`` routing option:
 
 .. configuration-block::
 
diff --git a/service_container.rst b/service_container.rst
@@ -238,7 +238,7 @@ You can also fetch a service directly from the container via its "id", which wil
 be its class name in this case::
 
     use AppBundle\Service\MessageGenerator;
-    
+
     // accessing services like this only works if you extend Controller
     class ProductController extends Controller
     {
@@ -475,7 +475,7 @@ pass here. No problem! In your configuration, you can explicitly set this argume
 
         // app/config/services.php
         use AppBundle\Updates\SiteUpdateManager;
-        
+
         // _defaults and importing directories does not work in PHP
         // but registering a service explicitly does
         $container->autowire(SiteUpdateManager::class)
@@ -773,7 +773,7 @@ from the container::
     public function newAction(MessageGenerator $messageGenerator)
     {
         // type-hinting it as an argument DOES work
-    
+
         // but accessing it directly from the container does NOT Work
         $this->container->get(MessageGenerator::class);
     }
@@ -818,47 +818,47 @@ Importing Many Services at once with resource
 You've already seen that you can import many services at once by using the ``resource``
 key. For example, the default Symfony configuration contains this:
 
-    .. configuration-block::
+.. configuration-block::
 
-        .. code-block:: yaml
+    .. code-block:: yaml
 
-            # app/config/services.yml
-            services:
-                # ...
+        # app/config/services.yml
+        services:
+            # ...
 
-                # the namespace prefix for classes (must end in \)
-                AppBundle\:
-                    # accepts a glob pattern
-                    resource: '../../src/AppBundle/*'
-                    # exclude some paths
-                    exclude: '../../src/AppBundle/{Entity,Repository}'
+            # the namespace prefix for classes (must end in \)
+            AppBundle\:
+                # accepts a glob pattern
+                resource: '../../src/AppBundle/*'
+                # exclude some paths
+                exclude: '../../src/AppBundle/{Entity,Repository}'
 
-                # these were imported above, but we want to add some extra config
-                AppBundle\Controller\:
-                    resource: '../../src/AppBundle/Controller'
-                    # apply some configuration to these services
-                    public: true
-                    tags: ['controller.service_arguments']
+            # these were imported above, but we want to add some extra config
+            AppBundle\Controller\:
+                resource: '../../src/AppBundle/Controller'
+                # apply some configuration to these services
+                public: true
+                tags: ['controller.service_arguments']
 
-        .. code-block:: xml
+    .. code-block:: xml
 
-            <!-- app/config/services.xml -->
-            <?xml version="1.0" encoding="UTF-8" ?>
-            <container xmlns="http://symfony.com/schema/dic/services"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xsi:schemaLocation="http://symfony.com/schema/dic/services
-                    http://symfony.com/schema/dic/services/services-1.0.xsd">
+        <!-- app/config/services.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd">
 
-                <services>
-                    <!-- ... -->
+            <services>
+                <!-- ... -->
 
-                    <prototype namespace="AppBundle\" resource="../../src/AppBundle/*" exclude="../../src/AppBundle/{Entity,Repository}" />
+                <prototype namespace="AppBundle\" resource="../../src/AppBundle/*" exclude="../../src/AppBundle/{Entity,Repository}" />
 
-                    <prototype namespace="AppBundle\Controller\" resource="../../src/AppBundle/Controller" public="true">
-                        <tag name="controller.service_arguments" />
-                    </prototype>
-                </services>
-            </container>
+                <prototype namespace="AppBundle\Controller\" resource="../../src/AppBundle/Controller" public="true">
+                    <tag name="controller.service_arguments" />
+                </prototype>
+            </services>
+        </container>
 
 This can be used to quickly make many classes available as services and apply some
 default configuration. The ``id`` of each service is its fully-qualified class name.
@@ -1002,4 +1002,4 @@ Learn more
     /service_container/*
 
 .. _`service-oriented architecture`: https://en.wikipedia.org/wiki/Service-oriented_architecture
-.. _`Symfony Standard Edition (version 3.3) services.yml`: https://github.com/symfony/symfony-standard/blob/master/app/config/services.yml
+.. _`Symfony Standard Edition (version 3.3) services.yml`: https://github.com/symfony/symfony-standard/blob/3.3/app/config/services.yml
diff --git a/service_container/tags.rst b/service_container/tags.rst
@@ -70,6 +70,25 @@ then some tags are automatically applied for you. That's true for the ``twig.ext
 tag: the container sees that your class extends ``Twig_Extension`` (or more accurately,
 that it implements ``Twig_ExtensionInterface``) and adds the tag for you.
 
+.. tip::
+
+    To apply a tag to all your autoconfigured services extending a class or an
+    interface, call the :method:`Symfony\\Component\\DependencyInjection\\ContainerBuilder::registerForAutoconfiguration`
+    method in an :doc:`extension </bundles/extension>` or from your kernel::
+
+        // app/AppKernel.php
+        class AppKernel extends Kernel
+        {
+            // ...
+
+            protected function build(ContainerBuilder $container)
+            {
+                $container->registerForAutoconfiguration(CustomInterface::class)
+                    ->addTag('app.custom_tag')
+                ;
+            }
+        }
+
 Creating custom Tags
 --------------------
 
diff --git a/templating.rst b/templating.rst
diff --git a/workflow/usage.rst b/workflow/usage.rst
