symfony
diff --git a/‎UPGRADE-3.0.md
Lines changed: 6 additions & 0 deletions b/‎UPGRADE-3.0.md
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
Lines changed: 3 additions & 5 deletions b/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
Lines changed: 3 additions & 5 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Lines changed: 13 additions & 13 deletions b/‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
Lines changed: 13 additions & 13 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Twig/Tests/Extension/FormExtensionDivLayoutTest.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FragmentRendererPass.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FragmentRendererPass.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Fragment/ContainerAwareHIncludeFragmentRenderer.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Fragment/ContainerAwareHIncludeFragmentRenderer.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/RequestHelper.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Templating/Helper/SessionHelper.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
Lines changed: 2 additions & 2 deletions
@@ -461,6 +461,12 @@ UPGRADE FROM 2.x to 3.0
            engines: ['php']
    ```
 
+ * The `form.csrf_provider` service is removed as it implements an adapter for
+   the new token manager to the deprecated
+   `Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface`
+   interface.
+   The `security.csrf.token_manager` should be used instead.
+
 ### HttpKernel
 
  * The `Symfony\Component\HttpKernel\Log\LoggerInterface` has been removed in
 
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Form\ChoiceList;
 
-trigger_error('The '.__NAMESPACE__.'\EntityChoiceList class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\EntityChoiceList class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader instead.', E_USER_DEPRECATED);
 
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\Common\Persistence\ObjectManager;
@@ -300,12 +300,11 @@ public function getValuesForChoices(array $entities)
      * @return array
      *
      * @see ChoiceListInterface
-     *
      * @deprecated since version 2.4, to be removed in 3.0.
      */
     public function getIndicesForChoices(array $entities)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         // Performance optimization
         if (empty($entities)) {
@@ -344,12 +343,11 @@ public function getIndicesForChoices(array $entities)
      * @return array
      *
      * @see ChoiceListInterface
-     *
      * @deprecated since version 2.4, to be removed in 3.0.
      */
     public function getIndicesForValues(array $values)
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.4 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         // Performance optimization
         if (empty($values)) {
 
@@ -57,14 +57,14 @@ public function __construct($queryBuilder, $manager = null, $class = null)
         }
 
         if ($queryBuilder instanceof \Closure) {
-            trigger_error('Passing a QueryBuilder closure to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('Passing a QueryBuilder closure to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
 
             if (!$manager instanceof EntityManager) {
                 throw new UnexpectedTypeException($manager, 'Doctrine\ORM\EntityManager');
             }
 
-            trigger_error('Passing an EntityManager to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
-            trigger_error('Passing a class to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('Passing an EntityManager to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
+            @trigger_error('Passing a class to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);
 
             $queryBuilder = $queryBuilder($manager->getRepository($class));
 
 
@@ -241,7 +241,7 @@ public function configureOptions(OptionsResolver $resolver)
         // deprecation note
         $propertyNormalizer = function (Options $options, $propertyName) {
             if ($propertyName) {
-                trigger_error('The "property" option is deprecated since version 2.7 and will be removed in 3.0. Use "choice_label" instead.', E_USER_DEPRECATED);
+                @trigger_error('The "property" option is deprecated since version 2.7 and will be removed in 3.0. Use "choice_label" instead.', E_USER_DEPRECATED);
             }
 
             return $propertyName;
@@ -260,7 +260,7 @@ public function configureOptions(OptionsResolver $resolver)
         // deprecation note
         $loaderNormalizer = function (Options $options, $loader) {
             if ($loader) {
-                trigger_error('The "loader" option is deprecated since version 2.7 and will be removed in 3.0. Override getLoader() instead.', E_USER_DEPRECATED);
+                @trigger_error('The "loader" option is deprecated since version 2.7 and will be removed in 3.0. Override getLoader() instead.', E_USER_DEPRECATED);
             }
 
             return $loader;
 
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Tests;
 
-trigger_error('The '.__NAMESPACE__.'\DoctrineOrmTestCase class is deprecated since version 2.4 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper class instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\DoctrineOrmTestCase class is deprecated since version 2.4 and will be removed in 3.0. Use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper class instead.', E_USER_DEPRECATED);
 
 use Doctrine\ORM\EntityManager;
 use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
 
@@ -134,7 +134,7 @@ public function testSetDataToUninitializedEntityWithNonRequired()
             'choice_label' => 'name',
         ));
 
-        $
741A
this->assertEquals(array(1 => new ChoiceView('Foo', '1', $entity1), 2 => new ChoiceView('Bar', '2', $entity2)), $field->createView()->vars['choices']);
+        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
     }
 
     public function testSetDataToUninitializedEntityWithNonRequiredToString()
@@ -150,7 +150,7 @@ public function testSetDataToUninitializedEntityWithNonRequiredToString()
             'required' => false,
         ));
 
-        $this->assertEquals(array(1 => new ChoiceView('Foo', '1', $entity1), 2 => new ChoiceView('Bar', '2', $entity2)), $field->createView()->vars['choices']);
+        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
     }
 
     public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
@@ -169,7 +169,7 @@ public function testSetDataToUninitializedEntityWithNonRequiredQueryBuilder()
             'query_builder' => $qb,
         ));
 
-        $this->assertEquals(array(1 => new ChoiceView('Foo', '1', $entity1), 2 => new ChoiceView('Bar', '2', $entity2)), $field->createView()->vars['choices']);
+        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
     }
 
     /**
@@ -513,7 +513,7 @@ public function testOverrideChoices()
 
         $field->submit('2');
 
-        $this->assertEquals(array(1 => new ChoiceView('Foo', '1', $entity1), 2 => new ChoiceView('Bar', '2', $entity2)), $field->createView()->vars['choices']);
+        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
         $this->assertTrue($field->isSynchronized());
         $this->assertSame($entity2, $field->getData());
         $this->assertSame('2', $field->getViewData());
@@ -541,13 +541,13 @@ public function testGroupByChoices()
         $this->assertSame('2', $field->getViewData());
         $this->assertEquals(array(
             'Group1' => new ChoiceGroupView('Group1', array(
-                1 => new ChoiceView('Foo', '1', $item1),
-                2 => new ChoiceView('Bar', '2', $item2),
+                1 => new ChoiceView($item1, '1', 'Foo'),
+                2 => new ChoiceView($item2, '2', 'Bar'),
             )),
             'Group2' => new ChoiceGroupView('Group2', array(
-                3 => new ChoiceView('Baz', '3', $item3),
+                3 => new ChoiceView($item3, '3', 'Baz'),
             )),
-            4 => new ChoiceView('Boo!', '4', $item4),
+            4 => new ChoiceView($item4, '4', 'Boo!'),
         ), $field->createView()->vars['choices']);
     }
 
@@ -566,8 +566,8 @@ public function testPreferredChoices()
             'choice_label' => 'name',
         ));
 
-        $this->assertEquals(array(3 => new ChoiceView('Baz', '3', $entity3), 2 => new ChoiceView('Bar', '2', $entity2)), $field->createView()->vars['preferred_choices']);
-        $this->assertEquals(array(1 => new ChoiceView('Foo', '1', $entity1)), $field->createView()->vars['choices']);
+        $this->assertEquals(array(3 => new ChoiceView($entity3, '3', 'Baz'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['preferred_choices']);
+        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo')), $field->createView()->vars['choices']);
     }
 
     public function testOverrideChoicesWithPreferredChoices()
@@ -586,8 +586,8 @@ public function testOverrideChoicesWithPreferredChoices()
             'choice_label' => 'name',
         ));
 
-        $this->assertEquals(array(3 => new ChoiceView('Baz', '3', $entity3)), $field->createView()->vars['preferred_choices']);
-        $this->assertEquals(array(2 => new ChoiceView('Bar', '2', $entity2)), $field->createView()->vars['choices']);
+        $this->assertEquals(array(3 => new ChoiceView($entity3, '3', 'Baz')), $field->createView()->vars['preferred_choices']);
+        $this->assertEquals(array(2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
     }
 
     public function testDisallowChoicesThatAreNotIncludedChoicesSingleIdentifier()
@@ -883,7 +883,7 @@ public function testPropertyOption()
             'property' => 'name',
         ));
 
-        $this->assertEquals(array(1 => new ChoiceView('Foo', '1', $entity1), 2 => new ChoiceView('Bar', '2', $entity2)), $field->createView()->vars['choices']);
+        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
     }
 
     protected function createRegistryMock($name, $em)
 
@@ -125,7 +125,7 @@ public function isSelectedChoiceProvider()
      */
     public function testIsChoiceSelected($expected, $choice, $value)
     {
-        $choice = new ChoiceView($choice.' label', $choice, $choice);
+        $choice = new ChoiceView($choice, $choice, $choice.' label');
 
         $this->assertSame($expected, $this->extension->isSelectedChoice($choice, $value));
     }
 
@@ -72,8 +72,8 @@ public function getExtractData()
     }
 
     /**
-     * @expectedException        \Twig_Error
-     * @expectedExceptionMessage Unclosed "block" in "extractor/syntax_error.twig" at line 1
+     * @expectedException              \Twig_Error
+     * @expectedExceptionMessageRegExp /Unclosed "block" in "extractor(\/|\\)syntax_error\.twig" at line 1/
      */
     public function testExtractSyntaxError()
     {
 
@@ -120,6 +120,7 @@ protected function addFlash($type, $message)
      * @param mixed $object     The object
      *
      * @throws \LogicException
+     *
      * @return bool
      */
     protected function isGranted($attributes, $object = null)
@@ -327,7 +328,7 @@ protected function has($id)
     protected function get($id)
     {
         if ('request' === $id) {
-            trigger_error('The "request" service is deprecated and will be removed in 3.0. Add a typehint for Symfony\\Component\\HttpFoundation\\Request to your controller parameters to retrieve the request instead.', E_USER_DEPRECATED);
+            @trigger_error('The "request" service is deprecated and will be removed in 3.0. Add a typehint for Symfony\\Component\\HttpFoundation\\Request to your controller parameters to retrieve the request instead.', E_USER_DEPRECATED);
         }
 
         return $this->container->get($id);
@@ -346,7 +347,7 @@ protected function getParameter($name)
     }
 
     /**
-     * Checks the validity of a CSRF token
+     * Checks the validity of a CSRF token.
      *
      * @param string $id    The id used when generating the token
      * @param string $token The actual token sent with the request that should be validated
 
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
-trigger_error('The '.__NAMESPACE__.'\FragmentRendererPass class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\HttpKernel\DependencyInjection\FragmentRendererPass instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\FragmentRendererPass class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Component\HttpKernel\DependencyInjection\FragmentRendererPass instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -48,7 +48,7 @@ public function getConfigTreeBuilder()
             ->beforeNormalization()
                 ->ifTrue(function ($v) { return isset($v['csrf_protection']['field_name']); })
                 ->then(function ($v) {
-                    trigger_error('The framework.csrf_protection.field_name configuration key is deprecated since version 2.4 and will be removed in 3.0. Use the framework.form.csrf_protection.field_name configuration key instead', E_USER_DEPRECATED);
+                    @trigger_error('The framework.csrf_protection.field_name configuration key is deprecated since version 2.4 and will be removed in 3.0. Use the framework.form.csrf_protection.field_name configuration key instead', E_USER_DEPRECATED);
 
                     return $v;
                 })
 
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Fragment;
 
-trigger_error('The '.__NAMESPACE__.'\ContainerAwareHIncludeFragmentRenderer class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Bundle\FrameworkBundle\Fragment\HIncludeFragmentRenderer instead.', E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ContainerAwareHIncludeFragmentRenderer class is deprecated since version 2.7 and will be removed in 3.0. Use Symfony\Bundle\FrameworkBundle\Fragment\HIncludeFragmentRenderer instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -43,7 +43,7 @@ public function __construct(ContainerInterface $container)
      */
     public function getSecurity()
     {
-        trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);
 
         if ($this->container->has('security.context')) {
             return $this->container->get('security.context');
 
@@ -35,7 +35,7 @@ class RequestHelper extends Helper
     public function __construct($requestStack)
     {
         if ($requestStack instanceof Request) {
-            trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);
+            @trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);
             $this->request = $requestStack;
         } elseif ($requestStack instanceof RequestStack) {
             $this->requestStack = $requestStack;
 
@@ -35,7 +35,7 @@ class SessionHelper extends Helper
     public function __construct($requestStack)
     {
         if ($requestStack instanceof Request) {
-            trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);
+            @trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);
             $this->session = $requestStack->getSession();
         } elseif ($requestStack instanceof RequestStack) {
             $this->requestStack = $requestStack;
 
@@ -22,7 +22,7 @@ class RouterDebugCommandTest extends \PHPUnit_Framework_TestCase
     public function testDebugAllRoutes()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => null));
+        $ret = $tester->execute(array('name' => null), array('decorated' => false));
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('[router] Current routes', $tester->getDisplay());
@@ -31,7 +31,7 @@ public function testDebugAllRoutes()
     public function testDebugSingleRoute()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('name' => 'foo'));
+        $ret = $tester->execute(array('name' => 'foo'), array('decorated' => false));
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('[router] Route "foo"', $tester->getDisplay());
 
@@ -24,7 +24,7 @@ class RouterMatchCommandTest extends \PHPUnit_Framework_TestCase
     public function testWithMatchPath()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('path_info' => '/foo', 'foo'));
+        $ret = $tester->execute(array('path_info' => '/foo', 'foo'), array('decorated' => false));
 
         $this->assertEquals(0, $ret, 'Returns 0 in case of success');
         $this->assertContains('[router] Route "foo"', $tester->getDisplay());
@@ -33,7 +33,7 @@ public function testWithMatchPath()
     public function testWithNotMatchPath()
     {
         $tester = $this->createCommandTester();
-        $ret = $tester->execute(array('path_info' => '/test', 'foo'));
+        $ret = $tester->execute(array('path_info' => '/test', 'foo'), array('decorated' => false));
 
         $this->assertEquals(1, $ret, 'Returns 1 in case of failure');
         $this->assertContains('None of the routes match the path "/test"', $tester->getDisplay());
Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,14 @@ public function __construct($queryBuilder, $manager = null, $class = null)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if ($queryBuilder instanceof \Closure) {`
`60`		`- trigger_error('Passing a QueryBuilder closure to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`60`	`+ @trigger_error('Passing a QueryBuilder closure to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`61`	`61`
`62`	`62`	`if (!$manager instanceof EntityManager) {`
`63`	`63`	`throw new UnexpectedTypeException($manager, 'Doctrine\ORM\EntityManager');`
`64`	`64`	`}`
`65`	`65`
`66`		`- trigger_error('Passing an EntityManager to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`67`		`- trigger_error('Passing a class to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`66`	`+ @trigger_error('Passing an EntityManager to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`67`	`+ @trigger_error('Passing a class to '.__CLASS__.'::__construct() is deprecated since version 2.7 and will be removed in 3.0.', E_USER_DEPRECATED);`
`68`	`68`
`69`	`69`	`$queryBuilder = $queryBuilder($manager->getRepository($class));`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function isSelectedChoiceProvider()`
`125`	`125`	`*/`
`126`	`126`	`public function testIsChoiceSelected($expected, $choice, $value)`
`127`	`127`	`{`
`128`		`- $choice = new ChoiceView($choice.' label', $choice, $choice);`
	`128`	`+ $choice = new ChoiceView($choice, $choice, $choice.' label');`
`129`	`129`
`130`	`130`	`$this->assertSame($expected, $this->extension->isSelectedChoice($choice, $value));`
`131`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ public function getExtractData()`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
`75`		`- * @expectedException \Twig_Error`
`76`		`- * @expectedExceptionMessage Unclosed "block" in "extractor/syntax_error.twig" at line 1`
	`75`	`+ * @expectedException \Twig_Error`
	`76`	`+ * @expectedExceptionMessageRegExp /Unclosed "block" in "extractor(\/\|\\)syntax_error\.twig" at line 1/`
`77`	`77`	`*/`
`78`	`78`	`public function testExtractSyntaxError()`
`79`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ protected function addFlash($type, $message)`
`120`	`120`	`* @param mixed $object The object`
`121`	`121`	`*`
`122`	`122`	`* @throws \LogicException`
	`123`	`+ *`
`123`	`124`	`* @return bool`
`124`	`125`	`*/`
`125`	`126`	`protected function isGranted($attributes, $object = null)`
`@@ -327,7 +328,7 @@ protected function has($id)`
`327`	`328`	`protected function get($id)`
`328`	`329`	`{`
`329`	`330`	`if ('request' === $id) {`
`330`		`- trigger_error('The "request" service is deprecated and will be removed in 3.0. Add a typehint for Symfony\\Component\\HttpFoundation\\Request to your controller parameters to retrieve the request instead.', E_USER_DEPRECATED);`
	`331`	`+ @trigger_error('The "request" service is deprecated and will be removed in 3.0. Add a typehint for Symfony\\Component\\HttpFoundation\\Request to your controller parameters to retrieve the request instead.', E_USER_DEPRECATED);`
`331`	`332`	`}`
`332`	`333`
`333`	`334`	`return $this->container->get($id);`
`@@ -346,7 +347,7 @@ protected function getParameter($name)`
`346`	`347`	`}`
`347`	`348`
`348`	`349`	`/**`
`349`		`- * Checks the validity of a CSRF token`
	`350`	`+ * Checks the validity of a CSRF token.`
`350`	`351`	`*`
`351`	`352`	`* @param string $id The id used when generating the token`
`352`	`353`	`* @param string $token The actual token sent with the request that should be validated`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(ContainerInterface $container)`
`43`	`43`	`*/`
`44`	`44`	`public function getSecurity()`
`45`	`45`	`{`
`46`		`- trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
	`46`	`+ @trigger_error('The '.__METHOD__.' method is deprecated since version 2.6 and will be removed in 3.0.', E_USER_DEPRECATED);`
`47`	`47`
`48`	`48`	`if ($this->container->has('security.context')) {`
`49`	`49`	`return $this->container->get('security.context');`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class RequestHelper extends Helper`
`35`	`35`	`public function __construct($requestStack)`
`36`	`36`	`{`
`37`	`37`	`if ($requestStack instanceof Request) {`
`38`		`- trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);`
	`38`	`+ @trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);`
`39`	`39`	`$this->request = $requestStack;`
`40`	`40`	`} elseif ($requestStack instanceof RequestStack) {`
`41`	`41`	`$this->requestStack = $requestStack;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class SessionHelper extends Helper`
`35`	`35`	`public function __construct($requestStack)`
`36`	`36`	`{`
`37`	`37`	`if ($requestStack instanceof Request) {`
`38`		`- trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);`
	`38`	`+ @trigger_error('Since version 2.5, passing a Request instance into the '.__METHOD__.' is deprecated and support for it will be removed in 3.0. Inject a Symfony\Component\HttpFoundation\RequestStack instance instead.', E_USER_DEPRECATED);`
`39`	`39`	`$this->session = $requestStack->getSession();`
`40`	`40`	`} elseif ($requestStack instanceof RequestStack) {`
`41`	`41`	`$this->requestStack = $requestStack;`