Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit 95cd2d3cbcb6 · 2016-12-13T20:29:17.000+01:00
* 2.7: Use PHP 5.5's ::class notation [#7243] minor tweak Deletes duplicate "Deprecated" and adds a more explicit example.
diff --git a/contributing/code/conventions.rst b/contributing/code/conventions.rst
@@ -92,7 +92,7 @@ A feature is marked as deprecated by adding a ``@deprecated`` phpdoc to
 relevant classes, methods, properties, ...::
 
     /**
-     * @deprecated Deprecated since version 2.8, to be removed in 3.0. Use XXX instead.
+     * @deprecated since version 2.8, to be removed in 3.0. Use XXX instead.
      */
 
 The deprecation message should indicate the version when the class/method was
@@ -111,3 +111,22 @@ ready to cope with them (by adding a custom error handler like the one used by
 the Web Debug Toolbar or by the PHPUnit bridge).
 
 .. _`@-silencing operator`: https://php.net/manual/en/language.operators.errorcontrol.php
+
+When deprecating a whole class the ``trigger_error()`` call should be placed
+between the namespace and the use declarations, like in this example from
+`ArrayParserCache`_::
+
+    namespace Symfony\Component\ExpressionLanguage\ParserCache;
+
+    @trigger_error('The '.__NAMESPACE__.'\ArrayParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.', E_USER_DEPRECATED);
+
+    use Symfony\Component\ExpressionLanguage\ParsedExpression;
+
+    /**
+     * @author Adrien Brault <adrien.brault@gmail.com>
+     *
+     * @deprecated ArrayParserCache class is deprecated since version 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.
+     */
+    class ArrayParserCache implements ParserCacheInterface
+
+.. _`ArrayParserCache`: https://github.com/symfony/symfony/blob/3.2/src/Symfony/Component/ExpressionLanguage/ParserCache/ArrayParserCache.php
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
@@ -270,7 +270,6 @@ and fill in the listener logic::
     use Symfony\Component\Form\Extension\Core\Type\TextType;
     use Symfony\Component\Form\Extension\Core\Type\TextareaType;
     use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-
     // ...
 
     class FriendMessageFormType extends AbstractType
diff --git a/form/unit_testing.rst b/form/unit_testing.rst
@@ -122,8 +122,10 @@ make sure the ``FormRegistry`` uses the created instance::
     // src/AppBundle/Tests/Form/Type/TestedTypeTests.php
     namespace AppBundle\Tests\Form\Type;
 
+    use AppBundle\Form\Type\TestedType;
     use Doctrine\Common\Persistence\ObjectManager;
     use Symfony\Component\Form\PreloadedExtension;
+    use Symfony\Component\Form\Test\TypeTestCase;
     // ...
 
     class TestedTypeTest extends TypeTestCase
@@ -175,6 +177,7 @@ allows you to return a list of extensions to register::
     namespace AppBundle\Tests\Form\Type;
 
     // ...
+    use AppBundle\Form\Type\TestedType;
     use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
     use Symfony\Component\Validator\ConstraintViolationList;
     use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -208,7 +211,6 @@ a good opportunity to use them::
     namespace AppBundle\Tests\Form\Type;
 
     use AppBundle\Form\Type\TestedType;
-    use AppBundle\Model\TestObject;
     use Symfony\Component\Form\Test\TypeTestCase;
 
     class TestedTypeTest extends TypeTestCase
