Merge branch '2.3' into 2.7

* 2.3:
  Fixed correct class name in thrown exception
  Add gc_mem_caches() call for PHP7 after itoken_get_all() as new memory manager will not release small buckets to OS automatically
  Removed a duplicated test in CardSchemeValidatorTest
  Fix perf and mem issue when using token_get_all
  [SecurityBundle] fix SecureRandom service constructor args
  Normalize params only when used.

Author: fabpot

Resources/config/security.xml

@@ -9,11 +9,7 @@
     </parameters>
 
     <services>
-        <!-- Pseudo-Random Number Generator -->
-        <service id="security.secure_random" class="%security.secure_random.class%">
-            <tag name="monolog.logger" channel="security" />
-            <argument>%kernel.cache_dir%/secure_random.seed</argument>
-            <argument type="service" id="logger" on-invalid="ignore" />
-        </service>
+        <!-- Pseudorandom Number Generator -->
+        <service id="security.secure_random" class="Symfony\Component\Security\Core\Util\SecureRandom" />
     </services>
 </container>

Translation/PhpExtractor.php

@@ -60,6 +60,11 @@ public function extract($resource, MessageCatalogue $catalog)
         $files = $this->extractFiles($resource);
         foreach ($files as $file) {
             $this->parseTokens(token_get_all(file_get_contents($file)), $catalog);
+
+            if (PHP_VERSION_ID >= 70000) {
+                // PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
+                gc_mem_caches();
+            }
         }
     }
 
@@ -80,7 +85,7 @@ public function setPrefix($prefix)
      */
     protected function normalizeToken($token)
     {
-        if (is_array($token)) {
+        if (isset($token[1]) && 'b"' !== $token) {
             return $token[1];
         }
 
@@ -94,7 +99,7 @@ private function seekToNextRelevantToken(\Iterator $tokenIterator)
     {
         for (; $tokenIterator->valid(); $tokenIterator->next()) {
             $t = $tokenIterator->current();
-            if (!is_array($t) || ($t[0] !== T_WHITESPACE)) {
+            if (T_WHITESPACE !== $t[0]) {
                 break;
             }
         }
@@ -111,7 +116,7 @@ private function getMessage(\Iterator $tokenIterator)
 
         for (; $tokenIterator->valid(); $tokenIterator->next()) {
             $t = $tokenIterator->current();
-            if (!is_array($t)) {
+            if (!isset($t[1])) {
                 break;
             }