Merge branch '3.2' into 3.3

* 3.2: fixed tests swiftmailer bridge is gone [TwigBundle] add back exception check Dont call count on non countable object Fix undefined variable $filesystem
symfony · Jun 24, 2017 · 7093fc1 · 7093fc1
2 parents 87601ba + 59094b4
commit 7093fc1
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -115,7 +115,6 @@
             "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
             "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
             "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
-            "Symfony\\Bridge\\Swiftmailer\\": "src/Symfony/Bridge/Swiftmailer/",
             "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
             "Symfony\\Bundle\\": "src/Symfony/Bundle/",
             "Symfony\\Component\\": "src/Symfony/Component/"

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -158,7 +158,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // remove the assets of the bundles that no longer exist
         foreach (new \FilesystemIterator($bundlesDir) as $dir) {
             if (!in_array($dir, $validAssetDirs)) {
-                $filesystem->remove($dir);
+                $this->filesystem->remove($dir);
             }
         }
 

diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -123,7 +123,7 @@ protected function findTemplate(Request $request, $format, $code, $showException
         // default to a generic HTML exception
         $request->setRequestFormat('html');
 
-        return sprintf('@Twig/Exception/%s.html.twig', $name);
+        return sprintf('@Twig/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
     }
 
     // to be removed when the minimum required version of Twig is >= 3.0

diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
@@ -48,6 +48,20 @@ public function testFallbackToHtmlIfNoTemplateForRequestedFormat()
         $this->assertEquals('html', $request->getRequestFormat());
     }
 
+    public function testFallbackToHtmlWithFullExceptionIfNoTemplateForRequestedFormatAndExceptionsShouldBeShown()
+    {
+        $twig = $this->createTwigEnv(array('@Twig/Exception/exception_full.html.twig' => '<html></html>'));
+
+        $request = $this->createRequest('txt');
+        $request->attributes->set('showException', true);
+        $exception = FlattenException::create(new \Exception());
+        $controller = new ExceptionController($twig, false);
+
+        $controller->showAction($request, $exception);
+
+        $this->assertEquals('html', $request->getRequestFormat());
+    }
+
     public function testResponseHasRequestedMimeType()
     {
         $twig = $this->createTwigEnv(array('@Twig/Exception/error.json.twig' => '{}'));

diff --git a/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php b/src/Symfony/Component/Translation/Dumper/IcuResFileDumper.php
@@ -52,7 +52,7 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
 
         $resOffset = $this->getPosition($data);
 
-        $data .= pack('v', count($messages))
+        $data .= pack('v', count($messages->all($domain)))
             .$indexes
             .$this->writePadding($data)
             .$resources
@@ -63,11 +63,11 @@ public function formatCatalogue(MessageCatalogue $messages, $domain, array $opti
         $root = pack('V7',
             $resOffset + (2 << 28), // Resource Offset + Resource Type
             6,                      // Index length
-            $keyTop,                // Index keys top
-            $bundleTop,             // Index resources top
-            $bundleTop,             // Index bundle top
-            count($messages),       // Index max table length
-            0                       // Index attributes
+            $keyTop,                        // Index keys top
+            $bundleTop,                     // Index resources top
+            $bundleTop,                     // Index bundle top
+            count($messages->all($domain)), // Index max table length
+            0                               // Index attributes
         );
 
         $header = pack('vC2v4C12@32',