bug #21528 [Cache] Fix class exists checks in PhpArrayAdapter (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 081f7b4f182a · 2017-02-05T11:19:28.000+01:00
This PR was merged into the 3.2 branch. Discussion ---------- [Cache] Fix class exists checks in PhpArrayAdapter | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Fixes HHVM, as spotted in #21527 Commits ------- 44e5989 [Cache] Fix class exists checks in PhpArrayAdapter
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -373,15 +373,15 @@ private function generateItems(array $keys)
      */
     public static function throwOnRequiredClass($class)
     {
-        $e = new \ReflectionException(sprintf('Class %s does not exist', $class));
+        $e = new \ReflectionException("Class $class does not exist");
         $trace = $e->getTrace();
         $autoloadFrame = array(
             'function' => 'spl_autoload_call',
             'args' => array($class),
         );
-        $i = array_search($autoloadFrame, $trace);
+        $i = 1 + array_search($autoloadFrame, $trace, true);
 
-        if (false !== $i++ && isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
+        if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
             switch ($trace[$i]['function']) {
                 case 'get_class_methods':
                 case 'get_class_vars':
