Merge branch '2.8' into 3.1

* 2.8: DX: replace @link with @see annotation bumped min version of Twig to 1.28
2016-11-16 17:17:09 -05:00 · 2016-11-16 17:17:09 -05:00 · a43ccb10a0
parent a813cb7f76 7487ccb501
commit a43ccb10a0
17 changed files with 34 additions and 27 deletions
--- a/composer.json
+++ b/composer.json
@ -18,7 +18,7 @@
    "require": {
        "php": ">=5.5.9",
        "doctrine/common": "~2.4",
-        "twig/twig": "~1.27|~2.0",
+        "twig/twig": "~1.28|~2.0",
        "psr/cache": "~1.0",
        "psr/log": "~1.0",
        "symfony/polyfill-intl-icu": "~1.0",
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@ -39,7 +39,7 @@
        "symfony/yaml": "~2.8|~3.0",
        "symfony/expression-language": "~2.8|~3.0",
        "doctrine/doctrine-bundle": "~1.4",
-        "twig/twig": "~1.27|~2.0"
+        "twig/twig": "~1.28|~2.0"
    },
    "suggest": {
        "symfony/security-acl": "For using the ACL functionality of this bundle"
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@ -21,7 +21,7 @@
        "symfony/twig-bridge": "~2.8|~3.0",
        "symfony/http-foundation": "~2.8|~3.0",
        "symfony/http-kernel": "~2.8|~3.0",
-        "twig/twig": "~1.27|~2.0"
+        "twig/twig": "~1.28|~2.0"
    },
    "require-dev": {
        "symfony/stopwatch": "~2.8|~3.0",
--- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@ -110,7 +110,7 @@ class ProfilerController
            'panel' => $panel,
            'page' => $page,
            'request' => $request,
-            'templates' => $this->getTemplateManager()->getTemplates($profile),
+            'templates' => $this->getTemplateManager()->getNames($profile),
            'is_ajax' => $request->isXmlHttpRequest(),
            'profiler_markup_version' => 2, // 1 = original profiler, 2 = Symfony 2.8+ profiler
        )), 200, array('Content-Type' => 'text/html'));
@ -189,7 +189,7 @@ class ProfilerController
            'request' => $request,
            'position' => $position,
            'profile' => $profile,
-            'templates' => $this->getTemplateManager()->getTemplates($profile),
+            'templates' => $this->getTemplateManager()->getNames($profile),
            'profiler_url' => $url,
            'token' => $token,
            'profiler_markup_version' => 2, // 1 = original toolbar, 2 = Symfony 2.8+ toolbar
--- a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@ -67,7 +67,9 @@ class TemplateManager
     *
     * @param Profile $profile
     *
-     * @return array
+     * @return Twig_Template[]
+     *
+     * @deprecated not used anymore internally
     */
    public function getTemplates(Profile $profile)
    {
@ -89,7 +91,7 @@ class TemplateManager
     *
     * @throws \UnexpectedValueException
     */
-    protected function getNames(Profile $profile)
+    public function getNames(Profile $profile)
    {
        $templates = array();

--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
@ -112,7 +112,11 @@
                {% if templates is defined %}
                    <ul id="menu-profiler">
                        {% for name, template in templates %}
-                            {% set menu %}{{ template.renderBlock('menu', { collector: profile.getcollector(name), profiler_markup_version: profiler_markup_version }) }}{% endset %}
+                            {% set menu -%}
+                                {% with { collector: profile.getcollector(name), profiler_markup_version: profiler_markup_version } %}
+                                    {{ block('menu', template) }}
+                                {% endwith %}
+                            {%- endset %}
                            {% if menu is not empty %}
                                <li class="{{ name }} {{ name == panel ? 'selected' : '' }}">
                                    <a href="{{ path('_profiler', { token: token, panel: name }) }}">{{ menu|raw }}</a>
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
@ -26,14 +26,15 @@

 <div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset clear-fix" data-no-turbolink>
    {% for name, template in templates %}
-        {{ template.renderblock('toolbar', {
-            'collector': profile.getcollector(name),
-            'profiler_url': profiler_url,
-            'token': profile.token,
-            'name': name,
-            'profiler_markup_version': profiler_markup_version
-          })
-        }}
+        {% with {
+            collector: profile.getcollector(name),
+            profiler_url: profiler_url,
+            token: profile.token,
+            name: name,
+            profiler_markup_version: profiler_markup_version
+          } %}
+            {{ block('toolbar', template) }}
+        {% endwith %}
    {% endfor %}

    {% if 'normal' != position %}
--- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php
+++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php
@ -22,7 +22,7 @@ use Symfony\Component\Console\Output\ConsoleOutputInterface;
 *
 * @author Kévin Dunglas <dunglas@gmail.com>
 *
- * @link http://www.php-fig.org/psr/psr-3/
+ * @see http://www.php-fig.org/psr/psr-3/
 */
 class ConsoleLogger extends AbstractLogger
 {
--- a/src/Symfony/Component/Form/FormTypeGuesserInterface.php
+++ b/src/Symfony/Component/Form/FormTypeGuesserInterface.php
@ -54,7 +54,7 @@ interface FormTypeGuesserInterface
     * Example:
     *  You want a float greater than 5, 4.512313 is not valid but length(4.512314) > length(5)
     *
-     * @link https://github.com/symfony/symfony/pull/3927
+     * @see https://github.com/symfony/symfony/pull/3927
     *
     * @param string $class    The fully qualified class name
     * @param string $property The name of the property to guess for
--- a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
@ -508,7 +508,7 @@ class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
    /**
     * @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
     *
-     * @link https://github.com/symfony/symfony/issues/3161
+     * @see https://github.com/symfony/symfony/issues/3161
     */
    public function testReverseTransformDisallowsNaN()
    {
--- a/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
+++ b/src/Symfony/Component/HttpFoundation/File/MimeType/FileinfoMimeTypeGuesser.php
@ -28,7 +28,7 @@ class FileinfoMimeTypeGuesser implements MimeTypeGuesserInterface
     *
     * @param string $magicFile A magic file to use with the finfo instance
     *
-     * @link http://www.php.net/manual/en/function.finfo-open.php
+     * @see http://www.php.net/manual/en/function.finfo-open.php
     */
    public function __construct($magicFile = null)
    {
--- a/src/Symfony/Component/HttpFoundation/Request.php
+++ b/src/Symfony/Component/HttpFoundation/Request.php
@ -1683,7 +1683,7 @@ class Request
     * It works if your JavaScript library sets an X-Requested-With HTTP header.
     * It is known to work with common JavaScript frameworks:
     *
-     * @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
+     * @see http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
     *
     * @return bool true if the request is an XMLHttpRequest, false otherwise
     */
--- a/src/Symfony/Component/HttpFoundation/Response.php
+++ b/src/Symfony/Component/HttpFoundation/Response.php
@ -1172,7 +1172,7 @@ class Response
    /**
     * Checks if we need to remove Cache-Control for SSL encrypted downloads when using IE < 9.
     *
-     * @link http://support.microsoft.com/kb/323308
+     * @see http://support.microsoft.com/kb/323308
     */
    protected function ensureIEOverSSLCompatibility(Request $request)
    {
--- a/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
+++ b/src/Symfony/Component/Intl/Data/Generator/RegionDataGenerator.php
@ -21,7 +21,7 @@ use Symfony\Component\Intl\Data\Util\LocaleScanner;
 *
 * @author Bernhard Schussek <bschussek@gmail.com>
 *
- * @link http://source.icu-project.org/repos/icu/icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Region.java
+ * @see http://source.icu-project.org/repos/icu/icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Region.java
 *
 * @internal
 */
--- a/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
+++ b/src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
@ -62,7 +62,7 @@ class BCryptPasswordEncoder extends BasePasswordEncoder
     *
     * @throws BadCredentialsException when the given password is too long
     *
-     * @link http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111
+     * @see http://lxr.php.net/xref/PHP_5_5/ext/standard/password.c#111
     */
    public function encodePassword($raw, $salt)
    {
--- a/src/Symfony/Component/Validator/Constraints/IbanValidator.php
+++ b/src/Symfony/Component/Validator/Constraints/IbanValidator.php
@ -20,7 +20,7 @@ use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 * @author Michael Schummel
 * @author Bernhard Schussek <bschussek@gmail.com>
 *
- * @link http://www.michael-schummel.de/2007/10/05/iban-prufung-mit-php/
+ * @see http://www.michael-schummel.de/2007/10/05/iban-prufung-mit-php/
 */
 class IbanValidator extends ConstraintValidator
 {
@ -33,7 +33,7 @@ class IbanValidator extends ConstraintValidator
     * a BBAN (Basic Bank Account Number) which has a fixed length per country and,
     * included within it, a bank identifier with a fixed position and a fixed length per country
     *
-     * @link http://www.swift.com/dsp/resources/documents/IBAN_Registry.pdf
+     * @see http://www.swift.com/dsp/resources/documents/IBAN_Registry.pdf
     *
     * @var array
     */
--- a/src/Symfony/Component/Validator/Constraints/Regex.php
+++ b/src/Symfony/Component/Validator/Constraints/Regex.php
@ -56,7 +56,7 @@ class Regex extends Constraint
     * Pattern is also ignored if match=false since the pattern should
     * then be reversed before application.
     *
-     * @link http://dev.w3.org/html5/spec/single-page.html#the-pattern-attribute
+     * @see http://dev.w3.org/html5/spec/single-page.html#the-pattern-attribute
     *
     * @return string|null
     */