o2system / reactor

src/Services/Loader.php

Spacing +25 added lines, -25 removed lines

@@ -103,7 +103,7 @@ 
     public function addNamespace($namespace, $baseDirectory, $prepend = false)
     {
         // normalize namespace prefix
-        $namespace = trim($namespace, '\\') . '\\';
+        $namespace = trim($namespace, '\\').'\\';
 
         if (empty($namespace) OR $namespace === '\\') {
             return;
@@ -111,24 +111,24 @@ 
 
         // normalize the base directory with a trailing separator
         $baseDirectory = str_replace(['/', '\\'], DIRECTORY_SEPARATOR, $baseDirectory);
-        $baseDirectory = rtrim($baseDirectory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $baseDirectory = rtrim($baseDirectory, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         if (is_dir($baseDirectory)) {
             // initialize the namespace prefix array
-            if (isset($this->namespaceDirs[ $namespace ]) === false) {
-                $this->namespaceDirs[ $namespace ] = [];
+            if (isset($this->namespaceDirs[$namespace]) === false) {
+                $this->namespaceDirs[$namespace] = [];
             }
 
             // retain the base directory for the namespace prefix
-            if ( ! in_array($baseDirectory, $this->namespaceDirs[ $namespace ])) {
+            if (!in_array($baseDirectory, $this->namespaceDirs[$namespace])) {
                 if ($prepend) {
-                    array_unshift($this->namespaceDirs[ $namespace ], $baseDirectory);
+                    array_unshift($this->namespaceDirs[$namespace], $baseDirectory);
                 } else {
-                    array_push($this->namespaceDirs[ $namespace ], $baseDirectory);
+                    array_push($this->namespaceDirs[$namespace], $baseDirectory);
                 }
             }
 
-            $this->namespaceDirsMap[ $baseDirectory ] = $namespace;
+            $this->namespaceDirsMap[$baseDirectory] = $namespace;
 
             // Register Namespace Language
             language()->addFilePath($baseDirectory);
@@ -137,8 +137,8 @@ 
             output()->addFilePath($baseDirectory);
 
             // Autoload Composer
-            if (is_file($baseDirectory . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php')) {
-                require($baseDirectory . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php');
+            if (is_file($baseDirectory.'vendor'.DIRECTORY_SEPARATOR.'autoload.php')) {
+                require($baseDirectory.'vendor'.DIRECTORY_SEPARATOR.'autoload.php');
             }
         }
     }
@@ -159,10 +159,10 @@ 
         $dir = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $dir);
 
         $dir = realpath($dir);
-        $dir = rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $dir = rtrim($dir, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
 
         if (array_key_exists($dir, $this->namespaceDirsMap)) {
-            return $this->namespaceDirsMap[ $dir ];
+            return $this->namespaceDirsMap[$dir];
         }
 
         return false;
@@ -200,10 +200,10 @@ 
      */
     public function getNamespaceDirs($namespace)
     {
-        $namespace = trim($namespace, '\\') . '\\';
+        $namespace = trim($namespace, '\\').'\\';
 
         if (array_key_exists($namespace, $this->namespaceDirs)) {
-            return $this->namespaceDirs[ $namespace ];
+            return $this->namespaceDirs[$namespace];
         }
 
         return false;
@@ -226,29 +226,29 @@ 
         }
 
         if ($this->requireFile($helper)) {
-            $this->loadedHelpers[ pathinfo($helper, PATHINFO_FILENAME) ][] = $helper;
+            $this->loadedHelpers[pathinfo($helper, PATHINFO_FILENAME)][] = $helper;
 
             return;
         }
 
         $helperDirectories = [
-            PATH_KERNEL . 'Helpers' . DIRECTORY_SEPARATOR,
-            PATH_REACTOR . 'Helpers' . DIRECTORY_SEPARATOR,
-            PATH_APP . 'Helpers' . DIRECTORY_SEPARATOR,
+            PATH_KERNEL.'Helpers'.DIRECTORY_SEPARATOR,
+            PATH_REACTOR.'Helpers'.DIRECTORY_SEPARATOR,
+            PATH_APP.'Helpers'.DIRECTORY_SEPARATOR,
         ];
         
-        if ( ! array_key_exists($helper, $this->loadedHelpers)) {
-            $this->loadedHelpers[ $helper ] = [];
+        if (!array_key_exists($helper, $this->loadedHelpers)) {
+            $this->loadedHelpers[$helper] = [];
         }
 
         foreach ($helperDirectories as $helperDirectory) {
 
-            $helperFilePath = $helperDirectory . studlycase($helper) . '.php';
+            $helperFilePath = $helperDirectory.studlycase($helper).'.php';
 
-            if (in_array($helperFilePath, $this->loadedHelpers[ $helper ])) {
+            if (in_array($helperFilePath, $this->loadedHelpers[$helper])) {
                 continue;
             } elseif ($this->requireFile($helperFilePath)) {
-                $this->loadedHelpers[ $helper ][] = $helperFilePath;
+                $this->loadedHelpers[$helper][] = $helperFilePath;
             }
         }
     }
@@ -324,12 +324,12 @@ 
     public function loadMappedFile($namespace, $relativeClass)
     {
         // are there any base directories for this namespace prefix?
-        if (isset($this->namespaceDirs[ $namespace ]) === false) {
+        if (isset($this->namespaceDirs[$namespace]) === false) {
             return false;
         }
 
         // look through base directories for this namespace prefix
-        foreach ($this->namespaceDirs[ $namespace ] as $namespaceDirectory) {
+        foreach ($this->namespaceDirs[$namespace] as $namespaceDirectory) {
 
             // replace the namespace prefix with the base directory,
             // replace namespace separators with directory separators

src/Cli/Commanders/Make.php

Spacing +4 added lines, -4 removed lines

@@ -97,14 +97,14 @@ 
     public function optionPath($path)
     {
         $path = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $path);
-        $path = PATH_ROOT . str_replace(PATH_ROOT, '', $path);
+        $path = PATH_ROOT.str_replace(PATH_ROOT, '', $path);
 
         if (pathinfo($path, PATHINFO_EXTENSION)) {
             $this->optionFilename(pathinfo($path, PATHINFO_FILENAME));
             $path = dirname($path);
         }
 
-        $this->optionPath = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $this->optionPath = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
     }
 
     // ------------------------------------------------------------------------
@@ -117,7 +117,7 @@ 
     public function optionFilename($name)
     {
         $name = str_replace('.php', '', $name);
-        $this->optionFilename = prepare_filename($name) . '.php';
+        $this->optionFilename = prepare_filename($name).'.php';
 
         $this->optionPath = empty($this->optionPath) ? modules()->current()->getRealPath() : $this->optionPath;
     }
@@ -156,7 +156,7 @@ 
     public function getPhpTemplateFile($filename)
     {
         $directories = [
-            PATH_REACTOR . 'Config' . DIRECTORY_SEPARATOR . 'PhpTemplateFiles',
+            PATH_REACTOR.'Config'.DIRECTORY_SEPARATOR.'PhpTemplateFiles',
         ];
 
     }