Merge branch '2.8' into 3.0

Author: Tobion

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -709,9 +709,8 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
                 ->in($dirs)
             ;
 
-            $locales = array();
             foreach ($finder as $file) {
-                list($domain, $locale, $format) = explode('.', $file->getBasename(), 3);
+                list(, $locale) = explode('.', $file->getBasename(), 3);
                 if (!isset($files[$locale])) {
                     $files[$locale] = array();
                 }

src/Symfony/Component/Form/DataTransformerInterface.php

@@ -58,7 +58,7 @@ public function transform($value);
      *
      * This method must be able to deal with empty values. Usually this will
      * be an empty string, but depending on your implementation other empty
-     * values are possible as well (such as empty strings). The reasoning behind
+     * values are possible as well (such as NULL). The reasoning behind
      * this is that value transformers must be chainable. If the
      * reverseTransform() method of the first value transformer outputs an
      * empty string, the second value transformer must be able to process that

src/Symfony/Component/Form/Forms.php

@@ -24,11 +24,12 @@
  * $formFactory = Forms::createFormFactory();
  *
  * $form = $formFactory->createBuilder()
- *     ->add('firstName', 'text')
- *     ->add('lastName', 'text')
- *     ->add('age', 'integer')
- *     ->add('gender', 'choice', array(
- *         'choices' => array('m' => 'Male', 'f' => 'Female'),
+ *     ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
+ *     ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
+ *     ->add('age', 'Symfony\Component\Form\Extension\Core\Type\IntegerType')
+ *     ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
+ *         'choices' => array('Male' => 'm', 'Female' => 'f'),
+ *         'choices_as_values' => true,
  *     ))
  *     ->getForm();
  * </code>

src/Symfony/Component/HttpKernel/Tests/DependencyInjection/MergeExtensionConfigurationPassTest.php

@@ -19,7 +19,14 @@ public function testAutoloadMainExtension()
     {
         $container = $this->getMock(
             'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
-            array('getExtensionConfig', 'loadFromExtension', 'getParameterBag')
+            array(
+                'getExtensionConfig',
+                'loadFromExtension',
+                'getParameterBag',
+                'getDefinitions',
+                'getAliases',
+                'getExtensions',
+            )
         );
         $params = $this->getMock('Symfony\\Component\\DependencyInjection\\ParameterBag\\ParameterBag');
 

src/Symfony/Component/HttpKernel/Tests/EventListener/RouterListenerTest.php

@@ -111,9 +111,6 @@ public function testSubRequestWithDifferentMethod()
                        ->will($this->returnValue(array()));
 
         $context = new RequestContext();
-        $requestMatcher->expects($this->any())
-                       ->method('getContext')
-                       ->will($this->returnValue($context));
 
         $listener = new RouterListener($requestMatcher, $this->requestStack, new RequestContext());
         $listener->onKernelRequest($event);

src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php

@@ -14,6 +14,7 @@
 use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * @group time-sensitive
@@ -27,15 +28,11 @@ public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
             ->getMock();
 
         // does not implement TerminableInterface
-        $kernelMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\HttpKernelInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $kernelMock->expects($this->never())
-            ->method('terminate');
+        $kernel = new TestKernel();
+        $httpCache = new HttpCache($kernel, $storeMock);
+        $httpCache->terminate(Request::create('/'), new Response());
 
-        $kernel = new HttpCache($kernelMock, $storeMock);
-        $kernel->terminate(Request::create('/'), new Response());
+        $this->assertFalse($kernel->terminateCalled, 'terminate() is never called if the kernel class does not implement TerminableInterface');
 
         // implements TerminableInterface
         $kernelMock = $this->getMockBuilder('Symfony\\Component\\HttpKernel\\Kernel')
@@ -1225,3 +1222,17 @@ public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses()
         $this->assertNull($this->response->getLastModified());
     }
 }
+
+class TestKernel implements HttpKernelInterface
+{
+    public $terminateCalled = false;
+
+    public function terminate(Request $request, Response $response)
+    {
+        $this->terminateCalled = true;
+    }
+
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+    }
+}

src/Symfony/Component/HttpKernel/Tests/KernelTest.php

@@ -98,7 +98,7 @@ public function testClassCacheIsLoaded()
 
     public function testClassCacheIsNotLoadedByDefault()
     {
-        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer'));
+        $kernel = $this->getKernel(array('initializeBundles', 'initializeContainer', 'doLoadClassCache'));
         $kernel->expects($this->never())
             ->method('doLoadClassCache');
 
@@ -687,22 +687,18 @@ public function testTerminateReturnsSilentlyIfKernelIsNotBooted()
     public function testTerminateDelegatesTerminationOnlyForTerminableInterface()
     {
         // does not implement TerminableInterface
-        $httpKernelMock = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $httpKernelMock
-            ->expects($this->never())
-            ->method('terminate');
+        $httpKernel = new TestKernel();
 
         $kernel = $this->getKernel(array('getHttpKernel'));
         $kernel->expects($this->once())
             ->method('getHttpKernel')
-            ->will($this->returnValue($httpKernelMock));
+            ->willReturn($httpKernel);
 
         $kernel->boot();
         $kernel->terminate(Request::create('/'), new Response());
 
+        $this->assertFalse($httpKernel->terminateCalled, 'terminate() is never called if the kernel class does not implement TerminableInterface');
+
         // implements TerminableInterface
         $httpKernelMock = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernel')
             ->disableOriginalConstructor()
@@ -804,3 +800,17 @@ protected function getKernelForTest(array $methods = array())
         return $kernel;
     }
 }
+
+class TestKernel implements HttpKernelInterface
+{
+    public $terminateCalled = false;
+
+    public function terminate()
+    {
+        $this->terminateCalled = true;
+    }
+
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    {
+    }
+}

src/Symfony/Component/Translation/Tests/Writer/TranslationWriterTest.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Translation\Tests\Writer;
 
+use Symfony\Component\Translation\Dumper\DumperInterface;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\Writer\TranslationWriter;
 
@@ -30,18 +31,35 @@ public function testWriteTranslations()
 
     public function testDisableBackup()
     {
-        $dumper = $this->getMock('Symfony\Component\Translation\Dumper\DumperInterface');
-        $dumper
-            ->expects($this->never())
-            ->method('setBackup');
-        $phpDumper = $this->getMock('Symfony\Component\Translation\Dumper\PhpFileDumper');
-        $phpDumper
-            ->expects($this->once())
-            ->method('setBackup');
+        $nonBackupDumper = new NonBackupDumper();
+        $backupDumper = new BackupDumper();
 
         $writer = new TranslationWriter();
-        $writer->addDumper('test', $dumper);
-        $writer->addDumper('php', $phpDumper);
+        $writer->addDumper('non_backup', $nonBackupDumper);
+        $writer->addDumper('backup', $backupDumper);
         $writer->disableBackup();
+
+        $this->assertFalse($backupDumper->backup, 'backup can be disabled if setBackup() method does exist');
+    }
+}
+
+class NonBackupDumper implements DumperInterface
+{
+    public function dump(MessageCatalogue $messages, $options = array())
+    {
+    }
+}
+
+class BackupDumper implements DumperInterface
+{
+    public $backup = true;
+
+    public function dump(MessageCatalogue $messages, $options = array())
+    {
+    }
+
+    public function setBackup($backup)
+    {
+        $this->backup = $backup;
     }
 }