Continued:

[core.git] / inc / loader / class_ClassLoader.php

diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php
index 3c72647f852823f2c11eb5ebc7a5121cfc258cb7..8ce7f4fe7732bbae6608045a4ce689c6b0d6a98d 100644 (file)
--- a/inc/loader/class_ClassLoader.php
+++ b/inc/loader/class_ClassLoader.php
@@ -1,10 +1,21 @@
 <?php
+// Own namespace
+namespace CoreFramework\Loader;
+
+// Import framework stuff
+use CoreFramework\Configuration\FrameworkConfiguration;
+use CoreFramework\Object\BaseFrameworkSystem;
+
+// Import SPL stuff
+use \RecursiveDirectoryIterator;
+use \RecursiveIteratorIterator;
+
 /**
  * This class loads class include files with a specific prefix and suffix
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -104,7 +115,7 @@ class ClassLoader {
        private static $frameworkPaths = array(
                'exceptions', // Exceptions
                'interfaces', // Interfaces
-               'main',       // General main classes
+               'classes',    // Classes
                'middleware'  // The middleware
        );
 
@@ -133,7 +144,7 @@ class ClassLoader {
                // Skip here if already cached
                if ($this->listCached === FALSE) {
                        // Writes the cache file of our list away
-                       $cacheContent = serialize($this->classes);
+                       $cacheContent = json_encode($this->classes);
                        file_put_contents($this->listCacheFQFN, $cacheContent);
                } // END - if
 
@@ -178,9 +189,9 @@ class ClassLoader {
                $loaderInstance = self::getSelfInstance();
 
                // Load all classes
-               foreach (self::$frameworkPaths as $className) {
+               foreach (self::$frameworkPaths as $pathName) {
                        // Try to load the framework classes
-                       $loaderInstance->scanClassPath('inc/classes/' . $className . '/');
+                       $loaderInstance->scanClassPath('inc/main/' . $pathName . '/');
                } // END - foreach
        }
 
@@ -235,19 +246,19 @@ class ClassLoader {
                } // END - if
 
                // IS the cache there?
-               if (file_exists($this->listCacheFQFN)) {
+               if (BaseFrameworkSystem::isReadableFile($this->listCacheFQFN)) {
                        // Get content
                        $cacheContent = file_get_contents($this->listCacheFQFN);
 
                        // And convert it
-                       $this->classes = unserialize($cacheContent);
+                       $this->classes = json_decode($cacheContent);
 
                        // List has been restored from cache!
                        $this->listCached = TRUE;
                } // END - if
 
                // Does the class cache exist?
-               if (file_exists($this->classCacheFQFN)) {
+               if (BaseFrameworkSystem::isReadableFile($this->listCacheFQFN)) {
                        // Then include it
                        require($this->classCacheFQFN);
 
@@ -462,7 +473,7 @@ class ClassLoader {
        }
 
        /**
-        * Getter for a printable list of included classes/interfaces/exceptions
+        * Getter for a printable list of included main/interfaces/exceptions
         *
         * @param       $includeList    A printable include list
         */
@@ -476,7 +487,5 @@ class ClassLoader {
                // And return it
                return $includeList;
        }
-}
 
-// [EOF]
-?>
+}