]> _ Git - cubist_util.git/commitdiff
#2783
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 23 May 2019 17:32:56 +0000 (19:32 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Thu, 23 May 2019 17:32:56 +0000 (19:32 +0200)
src/Cubist/Util/PHP.php

index ffd8c4d3b3ecb6c3d0fe5b04bf6d2289fb139b2f..8dda80570ab257d1a7c2d4ae7f5f1a3b022f7b2b 100644 (file)
@@ -17,12 +17,25 @@ class PHP
         }
     }
 
+    /**
+     * @param $file
+     * @return mixed
+     */
     public static function instanciateClassInFile($file)
     {
         $classes = get_declared_classes();
         include $file;
         $diff = array_diff(get_declared_classes(), $classes);
-        $class = reset($diff);
-        return new $class();
+        $class = null;
+        foreach ($diff as $diffclass) {
+            if (realpath($file) == realpath(self::getFileDeclaring($diffclass))) {
+                $class = $diffclass;
+                break;
+            }
+        }
+        if (null !== $class) {
+            return new $class();
+        }
+        return null;
     }
 }