Merge pull request #29 from msonowal/master

Fixes the namespace issues #11 if the models have custom namespace rather than App

Author: damiantw

composer.json

@@ -17,6 +17,9 @@
     "autoload": {
         "psr-4": {
             "DamianTW\\MySQLScout\\": "src/"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     }
 }

src/Services/IndexService.php

@@ -29,7 +29,7 @@ public function getAllSearchableModels($directories)
             $files = glob($directory.'/*.php');
 
             foreach ($files as $file) {
-                $class = $this->getAppNamespace().basename($file, '.php');
+                $class = getClassFullNameFromFile($file);
 
                 $modelInstance = new $class();
 

src/helpers.php

@@ -0,0 +1,99 @@
+<?php
+
+/**
+     * get the full name (name \ namespace) of a class from its file path
+     * result example: (string) "I\Am\The\Namespace\Of\This\Class"
+     *
+     * @param $filePathName
+     *
+     * @return  string
+     */
+    function getClassFullNameFromFile($filePathName)
+    {
+        return getClassNamespaceFromFile($filePathName) . '\\' . getClassNameFromFile($filePathName);
+    }
+
+
+    /**
+     * build and return an object of a class from its file path
+     *
+     * @param $filePathName
+     *
+     * @return  mixed
+     */
+    function getClassObjectFromFile($filePathName)
+    {
+        $classString = getClassFullNameFromFile($filePathName);
+
+        $object = new $classString;
+
+        return $object;
+    }
+
+
+    /**
+     * get the class namespace form file path using token
+     *
+     * @param $filePathName
+     *
+     * @return  null|string
+     */
+    function getClassNamespaceFromFile($filePathName)
+    {
+        $src = file_get_contents($filePathName);
+
+        $tokens = token_get_all($src);
+        $count = count($tokens);
+        $i = 0;
+        $namespace = '';
+        $namespace_ok = false;
+        while ($i < $count) {
+            $token = $tokens[$i];
+            if (is_array($token) && $token[0] === T_NAMESPACE) {
+                // Found namespace declaration
+                while (++$i < $count) {
+                    if ($tokens[$i] === ';') {
+                        $namespace_ok = true;
+                        $namespace = trim($namespace);
+                        break;
+                    }
+                    $namespace .= is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
+                }
+                break;
+            }
+            $i++;
+        }
+        if (!$namespace_ok) {
+            return null;
+        } else {
+            return $namespace;
+        }
+    }
+
+    /**
+     * get the class name form file path using token
+     *
+     * @param $filePathName
+     *
+     * @return  mixed
+     */
+    function getClassNameFromFile($filePathName)
+    {
+        $php_code = file_get_contents($filePathName);
+
+        $classes = array();
+        $tokens = token_get_all($php_code);
+        $count = count($tokens);
+        for ($i = 2; $i < $count; $i++) {
+            if ($tokens[$i - 2][0] == T_CLASS
+                && $tokens[$i - 1][0] == T_WHITESPACE
+                && $tokens[$i][0] == T_STRING
+            ) {
+
+                $class_name = $tokens[$i][1];
+                $classes[] = $class_name;
+            }
+        }
+
+        return $classes[0];
+    }