dwoo-project / dwoo

lib/Dwoo/Loader.php

Spacing +16 added lines, -16 removed lines

@@ -61,11 +61,11 @@ 
      */
     public function __construct($cacheDir)
     {
-        $this->corePluginDir = __DIR__ . DIRECTORY_SEPARATOR . 'Plugins';
-        $this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $this->corePluginDir = __DIR__.DIRECTORY_SEPARATOR.'Plugins';
+        $this->cacheDir      = rtrim($cacheDir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         // include class paths or rebuild paths if the cache file isn't there
-        $cacheFile = $this->cacheDir . 'classpath.cache.d' . Core::RELEASE_TAG . '.php';
+        $cacheFile = $this->cacheDir.'classpath.cache.d'.Core::RELEASE_TAG.'.php';
 
         $chachedClassPath = null;
 
@@ -74,7 +74,7 @@ 
             $chachedClassPath = unserialize(file_get_contents($cacheFile));
 
             if (is_array($chachedClassPath)) {
-                $this->classPath = $chachedClassPath + $this->classPath;
+                $this->classPath = $chachedClassPath+$this->classPath;
             }
         }
 
@@ -113,7 +113,7 @@ 
         // save in file if it's the first call (not recursed)
         if ($cacheFile !== false) {
             if (!file_put_contents($cacheFile, serialize($this->classPath), LOCK_EX)) {
-                throw new Exception('Could not write into ' . $cacheFile . ', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
+                throw new Exception('Could not write into '.$cacheFile.', either because the folder is not there (create it) or because of the chmod configuration (please ensure this directory is writable by php), alternatively you can change the directory used with $dwoo->setCompileDir() or provide a custom loader object with $dwoo->setLoader()');
             }
             $this->classPath += $tmp;
         }
@@ -138,22 +138,22 @@ 
          * so we check for that before trying to include() the plugin.
          */
         if ((!isset($this->classPath[$class]) || !is_readable($this->classPath[$class])) || (!isset
-                ($this->classPath[$class . 'Compile']) || !is_readable($this->classPath[$class . 'Compile']))) {
+                ($this->classPath[$class.'Compile']) || !is_readable($this->classPath[$class.'Compile']))) {
             if ($forceRehash) {
-                $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir . 'classpath.cache.d' .
-                    Core::RELEASE_TAG . '.php');
+                $this->rebuildClassPathCache($this->corePluginDir, $this->cacheDir.'classpath.cache.d'.
+                    Core::RELEASE_TAG.'.php');
                 foreach ($this->paths as $path => $file) {
                     $this->rebuildClassPathCache($path, $file);
                 }
                 if (isset($this->classPath[$class])) {
                     include_once $this->classPath[$class];
-                } elseif (isset($this->classPath[$class . 'Compile'])) {
-                    include_once $this->classPath[$class . 'Compile'];
+                } elseif (isset($this->classPath[$class.'Compile'])) {
+                    include_once $this->classPath[$class.'Compile'];
                 } else {
-                    throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+                    throw new Exception('Plugin "'.$class.'" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
                 }
             } else {
-                throw new Exception('Plugin "' . $class . '" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
+                throw new Exception('Plugin "'.$class.'" can not be found, maybe you forgot to bind it if it\'s a custom plugin ?', E_USER_NOTICE);
             }
         }
     }
@@ -175,14 +175,14 @@ 
     {
         $pluginDir = realpath($pluginDirectory);
         if (!$pluginDir) {
-            throw new Exception('Plugin directory does not exist or can not be read : ' . $pluginDirectory);
+            throw new Exception('Plugin directory does not exist or can not be read : '.$pluginDirectory);
         }
-        $cacheFile = $this->cacheDir . 'classpath-' . substr(strtr($pluginDir, '/\\:' . PATH_SEPARATOR, '----'),
-                strlen($pluginDir) > 80 ? - 80 : 0) . '.d' . Core::RELEASE_TAG . '.php';
+        $cacheFile = $this->cacheDir.'classpath-'.substr(strtr($pluginDir, '/\\:'.PATH_SEPARATOR, '----'),
+                strlen($pluginDir) > 80 ? -80 : 0).'.d'.Core::RELEASE_TAG.'.php';
         $this->paths[$pluginDir] = $cacheFile;
         if (file_exists($cacheFile)) {
             $classpath       = file_get_contents($cacheFile);
-            $this->classPath = unserialize($classpath) + $this->classPath;
+            $this->classPath = unserialize($classpath)+$this->classPath;
         } else {
             $this->rebuildClassPathCache($pluginDir, $cacheFile);
         }