Continued:

[core.git] / framework / main / tests / filter / tests / configuration / classes / class_TestConfigurationLoadableClassesFilter.php

diff --git a/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php b/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php
index e46919aba1fda99e4a0303cca6e49d8debf7e2c0..78ef72885d20188dad04d0f8cfac75c092774200 100644 (file)
--- a/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php
+++ b/framework/main/tests/filter/tests/configuration/classes/class_TestConfigurationLoadableClassesFilter.php
@@ -83,15 +83,22 @@ class TestConfigurationLoadableClassesFilter extends BaseTestsFilter implements
 
                        // This may throw exceptions
                        try {
-                               // Is the class there?
-                               if (!class_exists($configValue)) {
+                               // Is the config entry valid and class is there?
+                               if (!is_string($configKey)) {
+                                       // Is not a string
+                                       self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('configKey=%s has unexpected type "%s". FAILED', $configKey, gettype($configKey)));
+
+                                       // Skip further tests
+                                       $failed++;
+                                       continue;
+                               } elseif (!class_exists($configValue)) {
                                        // Class not found
                                        self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('Class "%s" not found. FAILED', $configValue));
 
                                        // Skip further tests
                                        $failed++;
                                        continue;
-                               } // END - if
+                               }
                        } catch (InvalidArgumentException $e) {
                                // Maybe not conform?
                                self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('Class "%s" failed to load. Message: "%s"', $configValue, $e->getMessage()));