Merge branch '3.4' into 4.4

* 3.4:
  add validator translation 99 for Italian language
  stop using the deprecated at() PHPUnit matcher
  Fix typehint phpdoc

Author: fabpot

Tests/Controller/TemplateControllerTest.php

@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Controller\TemplateController;
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>

Tests/Templating/DelegatingEngineTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\FrameworkBundle\Templating\DelegatingEngine;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
@@ -111,14 +112,10 @@ private function getFrameworkEngineMock($template, $supports)
 
     private function getContainerMock($services)
     {
-        $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
+        $container = new ContainerBuilder();
 
-        $i = 0;
         foreach ($services as $id => $service) {
-            $container->expects($this->at($i++))
-                ->method('get')
-                ->with($id)
-                ->willReturn($service);
+            $container->set($id, $service);
         }
 
         return $container;

Tests/Translation/TranslatorTest.php

@@ -184,17 +184,18 @@ public function testResourceFilesOptionLoadsBeforeOtherAddedResources($debug, $e
 
         $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
 
-        $loader->expects($this->at(0))
+        $loader->expects($this->exactly(2))
             ->method('load')
-            /* The "messages.some_locale.loader" is passed via the resource_file option and shall be loaded first */
-            ->with('messages.some_locale.loader', 'some_locale', 'messages')
-            ->willReturn($someCatalogue);
-
-        $loader->expects($this->at(1))
-            ->method('load')
-            /* This resource is added by an addResource() call and shall be loaded after the resource_files */
-            ->with('second_resource.some_locale.loader', 'some_locale', 'messages')
-            ->willReturn($someCatalogue);
+            ->withConsecutive(
+                /* The "messages.some_locale.loader" is passed via the resource_file option and shall be loaded first */
+                ['messages.some_locale.loader', 'some_locale', 'messages'],
+                /* This resource is added by an addResource() call and shall be loaded after the resource_files */
+                ['second_resource.some_locale.loader', 'some_locale', 'messages']
+            )
+            ->willReturnOnConsecutiveCalls(
+                $someCatalogue,
+                $someCatalogue
+            );
 
         $options = [
             'resource_files' => ['some_locale' => ['messages.some_locale.loader']],
@@ -301,55 +302,33 @@ protected function getLoader()
     {
         $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock();
         $loader
-            ->expects($this->at(0))
-            ->method('load')
-            ->willReturn($this->getCatalogue('fr', [
-                'foo' => 'foo (FR)',
-            ]))
-        ;
-        $loader
-            ->expects($this->at(1))
-            ->method('load')
-            ->willReturn($this->getCatalogue('en', [
-                'foo' => 'foo (EN)',
-                'bar' => 'bar (EN)',
-                'choice' => '{0} choice 0 (EN)|{1} choice 1 (EN)|]1,Inf] choice inf (EN)',
-            ]))
-        ;
-        $loader
-            ->expects($this->at(2))
-            ->method('load')
-            ->willReturn($this->getCatalogue('es', [
-                'foobar' => 'foobar (ES)',
-            ]))
-        ;
-        $loader
-            ->expects($this->at(3))
-            ->method('load')
-            ->willReturn($this->getCatalogue('pt-PT', [
-                'foobarfoo' => 'foobarfoo (PT-PT)',
-            ]))
-        ;
-        $loader
-            ->expects($this->at(4))
-            ->method('load')
-            ->willReturn($this->getCatalogue('pt_BR', [
-                'other choice' => '{0} other choice 0 (PT-BR)|{1} other choice 1 (PT-BR)|]1,Inf] other choice inf (PT-BR)',
-            ]))
-        ;
-        $loader
-            ->expects($this->at(5))
-            ->method('load')
-            ->willReturn($this->getCatalogue('fr.UTF-8', [
-                'foobarbaz' => 'foobarbaz (fr.UTF-8)',
-            ]))
-        ;
-        $loader
-            ->expects($this->at(6))
+            ->expects($this->exactly(7))
             ->method('load')
-            ->willReturn($this->getCatalogue('sr@latin', [
-                'foobarbax' => 'foobarbax (sr@latin)',
-            ]))
+            ->willReturnOnConsecutiveCalls(
+                $this->getCatalogue('fr', [
+                    'foo' => 'foo (FR)',
+                ]),
+                $this->getCatalogue('en', [
+                    'foo' => 'foo (EN)',
+                    'bar' => 'bar (EN)',
+                    'choice' => '{0} choice 0 (EN)|{1} choice 1 (EN)|]1,Inf] choice inf (EN)',
+                ]),
+                $this->getCatalogue('es', [
+                    'foobar' => 'foobar (ES)',
+                ]),
+                $this->getCatalogue('pt-PT', [
+                    'foobarfoo' => 'foobarfoo (PT-PT)',
+                ]),
+                $this->getCatalogue('pt_BR', [
+                    'other choice' => '{0} other choice 0 (PT-BR)|{1} other choice 1 (PT-BR)|]1,Inf] other choice inf (PT-BR)',
+                ]),
+                $this->getCatalogue('fr.UTF-8', [
+                    'foobarbaz' => 'foobarbaz (fr.UTF-8)',
+                ]),
+                $this->getCatalogue('sr@latin', [
+                    'foobarbax' => 'foobarbax (sr@latin)',
+                ])
+            )
         ;
 
         return $loader;