webstream-framework / WebStream

WebStream/Delegate/CoreDelegator.php

Spacing +21 added lines, -21 removed lines

@@ -72,67 +72,67 @@ 
         $classLoader->inject('logger', $container->logger)
                     ->inject('applicationInfo', $container->applicationInfo);
         $pageName = $this->getPageName();
-        $serviceClassName = $pageName . "Service";
-        $modelClassName   = $pageName . "Model";
-        $helperClassName  = $pageName . "Helper";
-        $appRoot = $container->applicationInfo->applicationRoot . "/app";
+        $serviceClassName = $pageName."Service";
+        $modelClassName   = $pageName."Model";
+        $helperClassName  = $pageName."Helper";
+        $appRoot = $container->applicationInfo->applicationRoot."/app";
         $controllerNamespace = $this->getNamespace($appRoot, $container->router->controller);
         $serviceNamespace    = $this->getNamespace($appRoot, $serviceClassName);
         $modelNamespace      = $this->getNamespace($appRoot, $modelClassName);
         $helperNamespace     = $this->getNamespace($appRoot, $helperClassName);
 
         // Controller
-        $this->coreContainer->controller = function () use ($container, $controllerNamespace) {
-            $controllerClassPath = $controllerNamespace . "\\" . $container->router->controller;
+        $this->coreContainer->controller = function() use ($container, $controllerNamespace) {
+            $controllerClassPath = $controllerNamespace."\\".$container->router->controller;
             if (!class_exists($controllerClassPath)) {
-                throw new ClassNotFoundException("Undefined class path: " . $controllerClassPath);
+                throw new ClassNotFoundException("Undefined class path: ".$controllerClassPath);
             }
 
             return new $controllerClassPath($container);
         };
 
         // View
-        $this->coreContainer->view = function () use ($container) {
+        $this->coreContainer->view = function() use ($container) {
             return new CoreView($container);
         };
 
         // Service
         if ($serviceNamespace !== null) {
-            $serviceClassPath = $serviceNamespace . "\\" . $serviceClassName;
-            $this->coreContainer->service = function () use ($container, $classLoader, $serviceClassPath, $serviceClassName) {
-                if ($classLoader->import($container->applicationInfo->applicationDir . "/services/" . $serviceClassName . ".php")) {
+            $serviceClassPath = $serviceNamespace."\\".$serviceClassName;
+            $this->coreContainer->service = function() use ($container, $classLoader, $serviceClassPath, $serviceClassName) {
+                if ($classLoader->import($container->applicationInfo->applicationDir."/services/".$serviceClassName.".php")) {
                     return new $serviceClassPath($container);
                 }
             };
         } else {
-            $this->coreContainer->service = function () {};
+            $this->coreContainer->service = function() {};
         }
 
         // Model
         if ($modelNamespace !== null) {
-            $modelClassPath = $modelNamespace . "\\" . $modelClassName;
-            $this->coreContainer->model = function () use ($container, $classLoader, $modelClassPath, $modelClassName) {
-                if ($classLoader->import($container->applicationInfo->applicationDir . "/models/" . $modelClassName . ".php")) {
+            $modelClassPath = $modelNamespace."\\".$modelClassName;
+            $this->coreContainer->model = function() use ($container, $classLoader, $modelClassPath, $modelClassName) {
+                if ($classLoader->import($container->applicationInfo->applicationDir."/models/".$modelClassName.".php")) {
                     return new $modelClassPath($container);
                 }
             };
         } else {
             $classpath = "\WebStream\Exception\Extend\ClassNotFoundException";
-            $message = $pageName . "Service and " . $pageName . "Model is not defined.";
+            $message = $pageName."Service and ".$pageName."Model is not defined.";
             $this->coreContainer->model = new CoreExceptionDelegator($classpath, $message);
         }
 
         // Helper
         if ($helperNamespace !== null) {
-            $helperClassPath = $helperNamespace . "\\" . $helperClassName;
-            $this->coreContainer->helper = function () use ($container, $classLoader, $helperClassPath, $helperClassName) {
-                if ($classLoader->import($container->applicationInfo->applicationDir . "/helpers/" . $helperClassName . ".php")) {
+            $helperClassPath = $helperNamespace."\\".$helperClassName;
+            $this->coreContainer->helper = function() use ($container, $classLoader, $helperClassPath, $helperClassName) {
+                if ($classLoader->import($container->applicationInfo->applicationDir."/helpers/".$helperClassName.".php")) {
                     return new $helperClassPath($container);
                 }
             };
         } else {
             $classpath = "\WebStream\Exception\Extend\ClassNotFoundException";
-            $message = $pageName . "Helper is not defined.";
+            $message = $pageName."Helper is not defined.";
             $this->coreContainer->helper = new CoreExceptionDelegator($classpath, $message);
         }
     }
@@ -152,7 +152,7 @@ 
                 \RecursiveIteratorIterator::CATCH_GET_CHILD // for Permission deny
             );
             foreach ($iterator as $filepath => $fileObject) {
-                if (strpos($filepath, $className . ".php") !== false) {
+                if (strpos($filepath, $className.".php") !== false) {
                     return $this->getDefinedNamespace($filepath);
                 }
             }

WebStream/Module/ClassLoader.php

Spacing +16 added lines, -16 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace WebStream\Module;
 
-require_once dirname(__FILE__) . '/Utility/FileUtils.php';
-require_once dirname(__FILE__) . '/../DI/Injector.php';
+require_once dirname(__FILE__).'/Utility/FileUtils.php';
+require_once dirname(__FILE__).'/../DI/Injector.php';
 
 use WebStream\Module\Utility\ApplicationUtils;
 use WebStream\Module\Utility\FileUtils;
@@ -49,13 +49,13 @@ 
      */
     public function import($filepath, callable $filter = null)
     {
-        $includeFile = $this->applicationRoot . "/" . $filepath;
+        $includeFile = $this->applicationRoot."/".$filepath;
         if (is_file($includeFile)) {
             $ext = pathinfo($includeFile, PATHINFO_EXTENSION);
             if ($ext === 'php') {
                 if ($filter === null || (is_callable($filter) && $filter($includeFile) === true)) {
                     include_once $includeFile;
-                    $this->logger->debug($includeFile . " import success.");
+                    $this->logger->debug($includeFile." import success.");
                 }
             }
 
@@ -73,7 +73,7 @@ 
      */
     public function importAll($dirPath, callable $filter = null)
     {
-        $includeDir = realpath($this->applicationRoot . "/" . $dirPath);
+        $includeDir = realpath($this->applicationRoot."/".$dirPath);
         if (is_dir($includeDir)) {
             $iterator = $this->getFileSearchIterator($includeDir);
             $isSuccess = true;
@@ -86,11 +86,11 @@ 
                     if ($ext === 'php') {
                         if ($filter === null || (is_callable($filter) && $filter($filepath) === true)) {
                             include_once $filepath;
-                            $this->logger->debug($filepath . " import success.");
+                            $this->logger->debug($filepath." import success.");
                         }
                     }
                 } else {
-                    $this->logger->warn($filepath . " import failure.");
+                    $this->logger->warn($filepath." import failure.");
                     $isSuccess = false;
                 }
             }
@@ -114,13 +114,13 @@ 
         }
 
         // appディレクトリを名前空間付きで全検索し、マッチするもの全てをincludeする
-        $iterator = $this->getFileSearchIterator($rootDir . "/app");
+        $iterator = $this->getFileSearchIterator($rootDir."/app");
         $includeList = [];
         foreach ($iterator as $filepath => $fileObject) {
-            if (strpos($filepath, $className . ".php") !== false) {
+            if (strpos($filepath, $className.".php") !== false) {
                 include_once $filepath;
                 $includeList[] = $filepath;
-                $this->logger->debug($filepath . " load success. (search from " . $rootDir . "/app/)");
+                $this->logger->debug($filepath." load success. (search from ".$rootDir."/app/)");
             }
         }
         if (!empty($includeList)) {
@@ -133,12 +133,12 @@ 
             $classNameWithoutNamespace = $matches[1];
             // この処理が走るケースはapp配下のクラスがディレクトリ構成と名前空間が一致していない
             // 場合以外ない(テスト用クラス除く)ので、app配下の検索を優先する
-            $iterator = $this->getFileSearchIterator($rootDir . "/app");
+            $iterator = $this->getFileSearchIterator($rootDir."/app");
             foreach ($iterator as $filepath => $fileObject) {
-                if (strpos($filepath, $classNameWithoutNamespace . ".php") !== false) {
+                if (strpos($filepath, $classNameWithoutNamespace.".php") !== false) {
                     include_once $filepath;
                     $includeList[] = $filepath;
-                    $this->logger->debug($filepath . " load success. (full search)");
+                    $this->logger->debug($filepath." load success. (full search)");
                 }
             }
             if (!empty($includeList)) {
@@ -146,12 +146,12 @@ 
             }
 
             // プロジェクトルート配下すべてのディレクトリを検索する
-            $iterator = $this->getFileSearchIterator($rootDir . "/core");
+            $iterator = $this->getFileSearchIterator($rootDir."/core");
             foreach ($iterator as $filepath => $fileObject) {
-                if (strpos($filepath, $classNameWithoutNamespace . ".php") !== false) {
+                if (strpos($filepath, $classNameWithoutNamespace.".php") !== false) {
                     include_once $filepath;
                     $includeList[] = $filepath;
-                    $this->logger->debug($filepath . " load success. (full search, use in test)");
+                    $this->logger->debug($filepath." load success. (full search, use in test)");
                 }
             }
             if (!empty($includeList)) {