Refactor PHPUnit_Util_Test::getHookMethods() to perform the class_exists() check

Author: sebastianbergmann

src/Framework/TestSuite.php

@@ -630,25 +630,16 @@ public function run(PHPUnit_Framework_TestResult $result = null)
             return $result;
         }
 
-        // Get hookMethods only if this is a testcase
-        // Otherwise $this->name may look like UnitTest::testMethod (e.g. when using @dataProvider)
-        $hookMethods = array();
-        if ($this->testCase && class_exists($this->name, false)) {
-            $hookMethods = PHPUnit_Util_Test::getHookMethods($this->name);
-        }
+        $hookMethods = PHPUnit_Util_Test::getHookMethods($this->name);
 
         $result->startTestSuite($this);
 
         try {
             $this->setUp();
 
-            // Some extensions use test names that are not classes;
-            // The method_exists() triggers an autoload call that causes issues with die()ing autoloaders.
-            if ($this->testCase && class_exists($this->name, false)) {
-                foreach ($hookMethods['beforeClass'] as $beforeClassMethod) {
-                    if (method_exists($this->name, $beforeClassMethod)) {
-                        call_user_func(array($this->name, $beforeClassMethod));
-                    }
+            foreach ($hookMethods['beforeClass'] as $beforeClassMethod) {
+                if (method_exists($this->name, $beforeClassMethod)) {
+                    call_user_func(array($this->name, $beforeClassMethod));
                 }
             }
         } catch (PHPUnit_Framework_SkippedTestSuiteError $e) {
@@ -684,13 +675,9 @@ public function run(PHPUnit_Framework_TestResult $result = null)
             $test->run($result);
         }
 
-        // Some extensions use test names that are not classes;
-        // The method_exists() triggers an autoload call that causes issues with die()ing autoloaders.
-        if ($this->testCase && class_exists($this->name, false)) {
-            foreach ($hookMethods['afterClass'] as $afterClassMethod) {
-                if (method_exists($this->name, $afterClassMethod)) {
-                    call_user_func(array($this->name, $afterClassMethod));
-                }
+        foreach ($hookMethods['afterClass'] as $afterClassMethod) {
+            if (method_exists($this->name, $afterClassMethod)) {
+                call_user_func(array($this->name, $afterClassMethod));
             }
         }
 

src/Util/Test.php

@@ -664,13 +664,12 @@ public static function getPreserveGlobalStateSettings($className, $methodName)
      */
     public static function getHookMethods($className)
     {
+        if (!class_exists($className, false)) {
+            return self::emptyHookMethodsArray();
+        }
+
         if (!isset(self::$hookMethods[$className])) {
-            self::$hookMethods[$className] = array(
-                'beforeClass' => array('setUpBeforeClass'),
-                'before' => array('setUp'),
-                'after' => array('tearDown'),
-                'afterClass' => array('tearDownAfterClass')
-            );
+            self::$hookMethods[$className] = self::emptyHookMethodsArray();
 
             try {
                 $class = new ReflectionClass($className);
@@ -703,6 +702,20 @@ public static function getHookMethods($className)
         return self::$hookMethods[$className];
     }
 
+    /**
+     * @return array
+     * @since  Method available since Release 4.0.9
+     */
+    private static function emptyHookMethodsArray()
+    {
+        return array(
+            'beforeClass' => array('setUpBeforeClass'),
+            'before' => array('setUp'),
+            'after' => array('tearDown'),
+            'afterClass' => array('tearDownAfterClass')
+        );
+    }
+
     /**
      * @param  string  $className
      * @param  string  $methodName