Merge branch '2.3' into 2.5

* 2.3: [#4928] Backporting change after merging into 2.5 (since 2.3 is a little different) Fixed a minor RST syntax issue Added a reference about including JS and CSS files in PHP templates Removed the Stable API chapter from the Symfony book Conflicts: book/stable_api.rst components/debug/introduction.rst
symfony · Feb 1, 2015 · 52e21f3 · 52e21f3
2 parents 008c4de + 0afc689
commit 52e21f3
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 82 deletions.
diff --git a/book/index.rst b/book/index.rst
@@ -22,6 +22,5 @@ The Book
     service_container
     performance
     internals
-    stable_api
 
 .. include:: /book/map.rst.inc
diff --git a/book/map.rst.inc b/book/map.rst.inc
@@ -16,4 +16,3 @@
 * :doc:`/book/service_container`
 * :doc:`/book/performance`
 * :doc:`/book/internals`
-* :doc:`/book/stable_api`
diff --git a/book/stable_api.rst b/book/stable_api.rst
diff --git a/book/templating.rst b/book/templating.rst
@@ -1091,43 +1091,76 @@ one called ``stylesheets`` inside the ``head`` tag and another called ``javascri
 just above the closing ``body`` tag. These blocks will contain all of the
 stylesheets and JavaScripts that you'll need throughout your site:
 
-.. code-block:: html+jinja
+.. configuration-block::
 
-    {# app/Resources/views/base.html.twig #}
-    <html>
-        <head>
-            {# ... #}
+    .. code-block:: html+jinja
 
-            {% block stylesheets %}
-                <link href="{{ asset('css/main.css') }}" rel="stylesheet" />
-            {% endblock %}
-        </head>
-        <body>
-            {# ... #}
+        {# app/Resources/views/base.html.twig #}
+        <html>
+            <head>
+                {# ... #}
 
-            {% block javascripts %}
-                <script src="{{ asset('js/main.js') }}"></script>
-            {% endblock %}
-        </body>
-    </html>
+                {% block stylesheets %}
+                    <link href="{{ asset('css/main.css') }}" rel="stylesheet" />
+                {% endblock %}
+            </head>
+            <body>
+                {# ... #}
+
+                {% block javascripts %}
+                    <script src="{{ asset('js/main.js') }}"></script>
+                {% endblock %}
+            </body>
+        </html>
+
+    .. code-block:: php
+
+        // app/Resources/views/base.html.php
+        <html>
+            <head>
+                <?php ... ?>
+
+                <?php $view['slots']->start('stylesheets') ?>
+                    <link href="<?php echo $view['assets']->getUrl('css/main.css') ?>" rel="stylesheet" />
+                <?php $view['slots']->stop() ?>
+            </head>
+            <body>
+                <?php ... ?>
+
+                <?php $view['slots']->start('javascripts') ?>
+                    <script src="<?php echo $view['assets']->getUrl('js/main.js') ?>"></script>
+                <?php $view['slots']->stop() ?>
+            </body>
+        </html>
 
 That's easy enough! But what if you need to include an extra stylesheet or
 JavaScript from a child template? For example, suppose you have a contact
 page and you need to include a ``contact.css`` stylesheet *just* on that
 page. From inside that contact page's template, do the following:
 
-.. code-block:: html+jinja
+.. configuration-block::
+
+    .. code-block:: html+jinja
+
+        {# app/Resources/views/Contact/contact.html.twig #}
+        {% extends 'base.html.twig' %}
+
+        {% block stylesheets %}
+            {{ parent() }}
+
+            <link href="{{ asset('css/contact.css') }}" rel="stylesheet" />
+        {% endblock %}
 
-    {# app/Resources/views/Contact/contact.html.twig #}
-    {% extends 'base.html.twig' %}
+        {# ... #}
 
-    {% block stylesheets %}
-        {{ parent() }}
+    .. code-block:: php
 
-        <link href="{{ asset('css/contact.css') }}" rel="stylesheet" />
-    {% endblock %}
+        // app/Resources/views/Contact/contact.html.twig
+        <?php $view->extend('base.html.php') ?>
 
-    {# ... #}
+        <?php $view['slots']->start('stylesheets') ?>
+            <link href="<?php echo $view['assets']->getUrl('css/contact.css') ?>" rel="stylesheet" />
+        <?php $view['slots']->stop() ?>
 
 In the child template, you simply override the ``stylesheets`` block and
 put your new stylesheet tag inside of that block. Of course, since you want

diff --git a/redirection_map b/redirection_map
@@ -1,3 +1,4 @@
+/book/stable_api /contributing/code/bc
 /cookbook/deployment-tools /cookbook/deployment/tools
 /cookbook/doctrine/migrations /bundles/DoctrineFixturesBundle/index
 /cookbook/doctrine/doctrine_fixtures /bundles/DoctrineFixturesBundle/index