Merge branch '2.2' into 2.3

* 2.2:
  [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)
  [SecurityBundle] Move format-dependent tests from SecurityExtensionTest

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php

Author: fabpot

Tests/Fixtures/Resources/views/translation.html.php

@@ -1,2 +1,3 @@
 This template is used for translation message extraction tests
-<?php echo $view['translator']->trans('new key') ?>
+<?php echo $view['translator']->trans('single-quoted key') ?>
+<?php echo $view['translator']->trans("double-quoted key") ?>

Tests/Translation/PhpExtractorTest.php

@@ -28,8 +28,9 @@ public function testExtraction()
         $extractor->extract(__DIR__.'/../Fixtures/Resources/views/', $catalogue);
 
         // Assert
-        $this->assertCount(1, $catalogue->all('messages'), '->extract() should find 1 translation');
-        $this->assertTrue($catalogue->has('new key'), '->extract() should find at leat "new key" message');
-        $this->assertEquals('prefixnew key', $catalogue->get('new key'), '->extract() should apply "prefix" as prefix');
+        $this->assertCount(2, $catalogue->all('messages'), '->extract() should find 1 translation');
+        $this->assertTrue($catalogue->has('single-quoted key'), '->extract() should find the "single-quoted key" message');
+        $this->assertTrue($catalogue->has('double-quoted key'), '->extract() should find the "double-quoted key" message');
+        $this->assertEquals('prefixsingle-quoted key', $catalogue->get('single-quoted key'), '->extract() should apply "prefix" as prefix');
     }
 }

Translation/PhpExtractor.php

@@ -111,7 +111,7 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
                     }
                 }
 
-                $message = trim($message, '\'');
+                $message = trim($message, '\'"');
 
                 if ($message) {
                     $catalog->set($message, $this->prefix.$message);