webstream-framework / WebStream

WebStream/Delegate/CoreDelegator.php

Doc Comments +2 added lines, -1 removed lines

@@ -39,7 +39,7 @@ 
 
     /**
      * Constructor
-     * @param Container 依存コンテナ
+     * @param Container Container
      */
     public function __construct(Container $container)
     {
@@ -141,6 +141,7 @@ 
      * 名前空間を返却する
      * @param string アプリケーションルート
      * @param string クラス名
+     * @param string $appRoot
      * @return string 名前空間
      */
     public function getNamespace($appRoot, $className)

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);
                 }
             }

Indentation +4 added lines, -4 removed lines

@@ -90,10 +90,10 @@
 
             $controller = new $controllerClassPath();
             $controller->inject('request', $container->request)
-                       ->inject('response', $container->response)
-                       ->inject('session', $container->session)
-                       ->inject('coreDelegator', $container->coreDelegator)
-                       ->inject('logger', $container->logger);
+                        ->inject('response', $container->response)
+                        ->inject('session', $container->session)
+                        ->inject('coreDelegator', $container->coreDelegator)
+                        ->inject('logger', $container->logger);
 
             $container->logger->debug("Controller start.");
 

WebStream/Module/Functions.php

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 if (!function_exists('safetyOutJSON')) {
     function safetyOutJSON($data)
     {
-        return json_encode($data, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT);
+        return json_encode($data, JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS|JSON_HEX_QUOT);
     }
 }
 
@@ -65,6 +65,6 @@ 
 if (!function_exists('safetyOutJSONP')) {
     function safetyOutJSONP($data, $callback)
     {
-        return safetyOutJavaScript($callback) . "(" . safetyOutJSON($data) . ");";
+        return safetyOutJavaScript($callback)."(".safetyOutJSON($data).");";
     }
 }

WebStream/Database/EntityManager.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
                 if (array_key_exists($col, $propertyMap)) {
                     $propertyMap[$col]->setValue($instance, $value);
                 } else {
-                    $this->logger->error("Column '$col' is failed mapping in " . $this->classpath);
+                    $this->logger->error("Column '$col' is failed mapping in ".$this->classpath);
                 }
             }
         }

WebStream/Cache/Driver/Apcu.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace WebStream\Cache\Driver;
 
-use WebStream\DI\Injector;
 use WebStream\Module\Container;
 
 /**

Spacing +15 added lines, -16 removed lines

@@ -30,9 +30,9 @@ 
     public function __construct(Container $cacheContainer)
     {
         $this->cacheContainer = $cacheContainer;
-        $this->cachePrefix = $this->cacheContainer->cachePrefix . '.';
+        $this->cachePrefix = $this->cacheContainer->cachePrefix.'.';
         if (!empty($this->cacheContainer->classPrefix)) {
-            $this->cachePrefix .= $this->cacheContainer->classPrefix . '.';
+            $this->cachePrefix .= $this->cacheContainer->classPrefix.'.';
         }
     }
 
@@ -44,11 +44,10 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
 
-        $result = $overwrite ? $this->cacheContainer->driver->delegate("apcu_store", [$key, $value, $ttl]) :
-            $this->cacheContainer->driver->delegate("apcu_add", [$key, $value, $ttl]);
-        $this->logger->info("Execute cache save: " . $key);
+        $result = $overwrite ? $this->cacheContainer->driver->delegate("apcu_store", [$key, $value, $ttl]) : $this->cacheContainer->driver->delegate("apcu_add", [$key, $value, $ttl]);
+        $this->logger->info("Execute cache save: ".$key);
 
         return $result;
     }
@@ -61,13 +60,13 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return null;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $value = $this->cacheContainer->driver->delegate("apcu_fetch", [$key]);
 
         if ($value !== false) {
-            $this->logger->info("Execute cache read: " . $key);
+            $this->logger->info("Execute cache read: ".$key);
         } else {
-            $this->logger->warn("Failed to read cache: " . $key);
+            $this->logger->warn("Failed to read cache: ".$key);
             $value = null;
         }
 
@@ -82,13 +81,13 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
 
         if ($this->cacheContainer->driver->delegate("apcu_delete", [$key])) {
-            $this->logger->info("Execute cache cleared: " . $key);
+            $this->logger->info("Execute cache cleared: ".$key);
             return true;
         } else {
-            $this->logger->warn("Failed to clear cache: " . $key);
+            $this->logger->warn("Failed to clear cache: ".$key);
             return false;
         }
     }
@@ -103,17 +102,17 @@ 
         }
 
         if (class_exists('\APCUIterator')) {
-            $obj = new \APCUIterator('/^' . $this->cachePrefix . '/', APC_ITER_KEY);
+            $obj = new \APCUIterator('/^'.$this->cachePrefix.'/', APC_ITER_KEY);
             if ($this->cacheContainer->driver->delegate("apcu_delete", [$obj])) {
-                $this->logger->info("Execute all cache cleared: " . $this->cachePrefix . "*");
+                $this->logger->info("Execute all cache cleared: ".$this->cachePrefix."*");
                 return true;
             }
         } elseif ($this->cacheContainer->driver->delegate("apcu_clear_cache")) {
-            $this->logger->info("Execute all cache cleared: " . $this->cachePrefix . "*");
+            $this->logger->info("Execute all cache cleared: ".$this->cachePrefix."*");
             return true;
         }
 
-        $this->logger->warn("Failed to clear all cache: " . $this->cachePrefix . "*");
+        $this->logger->warn("Failed to clear all cache: ".$this->cachePrefix."*");
         return false;
     }
 

WebStream/Cache/Driver/Redis.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace WebStream\Cache\Driver;
 
-use WebStream\DI\Injector;
 use WebStream\Module\Container;
 
 /**

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
     public function __construct(Container $cacheContainer)
     {
         $this->cacheContainer = $cacheContainer;
-        $this->cachePrefix = $this->cacheContainer->cachePrefix . '.' . $this->cacheContainer->classPrefix . '.';
+        $this->cachePrefix = $this->cacheContainer->cachePrefix.'.'.$this->cacheContainer->classPrefix.'.';
     }
 
     /**
@@ -61,7 +61,7 @@ 
             }
         }
 
-        $this->logger->info("Execute cache save: " . $key);
+        $this->logger->info("Execute cache save: ".$key);
 
         return $result;
     }
@@ -76,12 +76,12 @@ 
         }
 
         $result = $this->cacheContainer->driver->get($key);
-        $this->logger->info("Execute cache read: " . $key);
+        $this->logger->info("Execute cache read: ".$key);
 
         if ($result !== false) {
-            $this->logger->info("Execute cache read: " . $key);
+            $this->logger->info("Execute cache read: ".$key);
         } else {
-            $this->logger->warn("Failed to read cache: " . $key);
+            $this->logger->warn("Failed to read cache: ".$key);
             $result = null;
         }
 
@@ -98,10 +98,10 @@ 
         }
 
         if ($this->cacheContainer->driver->delete($key) > 0) {
-            $this->logger->info("Execute cache cleared: " . $key);
+            $this->logger->info("Execute cache cleared: ".$key);
             return true;
         } else {
-            $this->logger->warn("Failed to clear cache: " . $key);
+            $this->logger->warn("Failed to clear cache: ".$key);
             return false;
         }
     }
@@ -124,10 +124,10 @@ 
         $this->cacheContainer->driver->setOption($this->cacheContainer->redisOptPrefix, $this->cachePrefix);
 
         if ($result > 0) {
-            $this->logger->info("Execute all cache cleared: " . $this->cachePrefix . "*");
+            $this->logger->info("Execute all cache cleared: ".$this->cachePrefix."*");
             return true;
         } else {
-            $this->logger->warn("Failed to clear all cache: " . $this->cachePrefix . "*");
+            $this->logger->warn("Failed to clear all cache: ".$this->cachePrefix."*");
             return false;
         }
     }

WebStream/Cache/Driver/TemporaryFile.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace WebStream\Cache\Driver;
 
-use WebStream\DI\Injector;
 use WebStream\Module\Container;
 
 /**

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
     public function __construct(Container $cacheContainer)
     {
         $this->cacheContainer = $cacheContainer;
-        $this->cachePrefix = $this->cacheContainer->cachePrefix . '.' . $this->cacheContainer->classPrefix . '.';
+        $this->cachePrefix = $this->cacheContainer->cachePrefix.'.'.$this->cacheContainer->classPrefix.'.';
     }
 
     /**
@@ -44,7 +44,7 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $writer = null;
         $isAppend = !$overwrite;
 
@@ -55,10 +55,10 @@ 
         ]);
 
         try {
-            $file = new File($this->cacheContainer->cacheDir . '/' . $key . '.cache');
+            $file = new File($this->cacheContainer->cacheDir.'/'.$key.'.cache');
             $writer = $this->cacheContainer->ioContainer->fileWriter->getWriter($file, $isAppend);
             $writer->write($value);
-            $this->logger->info("Execute cache save: " . $key);
+            $this->logger->info("Execute cache save: ".$key);
             return true;
         } catch (IOException $e) {
             $this->logger->warn($e->getMessage());
@@ -82,10 +82,10 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return null;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $value = null;
         $reader = null;
-        $file = new File($this->cacheContainer->cacheDir . '/' . $key . '.cache');
+        $file = new File($this->cacheContainer->cacheDir.'/'.$key.'.cache');
 
         if ($file->isReadable()) {
             try {
@@ -93,12 +93,12 @@ 
                 $data = $this->decode($reader->read());
                 if ($data['ttl'] > 0) {
                     if (time() > $data['time'] + $data['ttl']) {
-                        $this->logger->info("Expired cache: " . $key);
+                        $this->logger->info("Expired cache: ".$key);
                         $file->delete();
                     }
                 } else {
                     $value = $data['data'];
-                    $this->logger->info("Execute cache read: " . $key);
+                    $this->logger->info("Execute cache read: ".$key);
                 }
             } catch (IOException $e) {
                 $this->logger->warn($e->getMessage());
@@ -124,19 +124,19 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $result = false;
 
-        $file = new File($this->cacheContainer->cacheDir . '/' . $key . '.cache');
+        $file = new File($this->cacheContainer->cacheDir.'/'.$key.'.cache');
         if ($file->isWritable()) {
             $result = $file->delete();
             if ($result) {
-                $this->logger->info("Execute cache cleared: " . $key);
+                $this->logger->info("Execute cache cleared: ".$key);
             } else {
-                $this->logger->warn("Failed to clear cache: " . $key);
+                $this->logger->warn("Failed to clear cache: ".$key);
             }
         } else {
-            $this->logger->warn("Failed to clear cache: " . $key);
+            $this->logger->warn("Failed to clear cache: ".$key);
         }
 
         return $result;
@@ -161,9 +161,9 @@ 
                         $file = new File($filepath);
                         if ($file->isWritable()) {
                             if ($file->delete()) {
-                                $this->logger->info("Execute cache cleared: " . $this->cachePrefix . "*");
+                                $this->logger->info("Execute cache cleared: ".$this->cachePrefix."*");
                             } else {
-                                $this->logger->warn("Failed to clear cache: " . $this->cachePrefix . "*");
+                                $this->logger->warn("Failed to clear cache: ".$this->cachePrefix."*");
                                 $result = false;
                             }
                         } else {
@@ -176,7 +176,7 @@ 
                 }
             }
         } else {
-            $this->logger->warn("Can't read directory:" . $dir->getFilePath());
+            $this->logger->warn("Can't read directory:".$dir->getFilePath());
             $result = false;
         }
 

WebStream/Cache/Driver/CacheDriverFactory.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
                     $cacheContainer->driver->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_IGBINARY);
                 }
 
-                $cacheContainer->driver->setOption(\Redis::OPT_PREFIX, $container->cachePrefix . '.' . $container->classPrefix);
+                $cacheContainer->driver->setOption(\Redis::OPT_PREFIX, $container->cachePrefix.'.'.$container->classPrefix);
                 $cacheContainer->driver->setOption(\Redis::OPT_SCAN, \Redis::SCAN_RETRY);
             }
         }

WebStream/Cache/Driver/Memcached.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
     public function __construct(Container $cacheContainer)
     {
         $this->cacheContainer = $cacheContainer;
-        $this->cachePrefix = $this->cacheContainer->cachePrefix . '.' . $this->cacheContainer->classPrefix . '.';
+        $this->cachePrefix = $this->cacheContainer->cachePrefix.'.'.$this->cacheContainer->classPrefix.'.';
     }
 
     /**
@@ -41,7 +41,7 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $result = null;
 
         if ($ttl > 0) {
@@ -64,7 +64,7 @@ 
             }
         }
 
-        $this->logger->info("Execute cache save: " . $key);
+        $this->logger->info("Execute cache save: ".$key);
         $this->verifyReturnCode($this->cacheContainer->codes['success']);
 
         return $result;
@@ -78,13 +78,13 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $result = $this->cacheContainer->driver->get($key);
 
         if ($result !== false) {
-            $this->logger->info("Execute cache read: " . $key);
+            $this->logger->info("Execute cache read: ".$key);
         } else {
-            $this->logger->warn("Failed to read cache: " . $key);
+            $this->logger->warn("Failed to read cache: ".$key);
         }
 
         return $this->verifyReturnCode($this->cacheContainer->codes['success']) ? $result : null;
@@ -98,14 +98,14 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $this->cacheContainer->driver->delete($key);
 
         if ($this->verifyReturnCode($this->cacheContainer->codes['notfound'])) {
-            $this->logger->info("Execute cache cleared: " . $key);
+            $this->logger->info("Execute cache cleared: ".$key);
             return true;
         } else {
-            $this->logger->warn("Failed to clear cache: " . $key);
+            $this->logger->warn("Failed to clear cache: ".$key);
             return false;
         }
     }
@@ -120,7 +120,7 @@ 
         }
         $allKeys = $this->cacheContainer->driver->getAllKeys();
         if ($allKeys === false) {
-            $this->logger->warn("Can't get cache keys: " . $this->cachePrefix . "*");
+            $this->logger->warn("Can't get cache keys: ".$this->cachePrefix."*");
             $this->cacheContainer->driver->flush();
 
             return true;
@@ -137,10 +137,10 @@ 
         $this->cacheContainer->driver->deleteMulti($targetKeys);
 
         if ($this->verifyReturnCode($this->cacheContainer->codes['notfound'])) {
-            $this->logger->info("Execute all cache cleared: " . $this->cachePrefix . "*");
+            $this->logger->info("Execute all cache cleared: ".$this->cachePrefix."*");
             return true;
         } else {
-            $this->logger->warn("Failed to clear all cache: " . $this->cachePrefix . "*");
+            $this->logger->warn("Failed to clear all cache: ".$this->cachePrefix."*");
             return false;
         }
     }

WebStream/Delegate/CoreExecuteDelegator.php

Spacing +3 added lines, -3 removed lines

@@ -181,11 +181,11 @@ 
 
         // テンプレートキャッシュチェック
         $pageName = $this->container->coreDelegator->getPageName();
-        $cacheFile = $applicationInfo->cachePrefix . $this->camel2snake($pageName) . "-" . $this->camel2snake($method);
+        $cacheFile = $applicationInfo->cachePrefix.$this->camel2snake($pageName)."-".$this->camel2snake($method);
 
         $factory = new CacheDriverFactory();
         $config = new Container(false);
-        $config->cacheDir = $applicationInfo->applicationRoot . "/app/views/" . $applicationInfo->cacheDir;
+        $config->cacheDir = $applicationInfo->applicationRoot."/app/views/".$applicationInfo->cacheDir;
         $config->classPrefix = "view_cache";
         $cache = $factory->create("WebStream\Cache\Driver\TemporaryFile", $config);
         $cache->inject('logger', $this->logger);
@@ -254,7 +254,7 @@ 
             ]);
 
             if ($template->cacheTime !== null) {
-                $cacheFile = $applicationInfo->cachePrefix . $this->camel2snake($pageName) . "-" . $this->camel2snake($method);
+                $cacheFile = $applicationInfo->cachePrefix.$this->camel2snake($pageName)."-".$this->camel2snake($method);
                 $view->templateCache($cacheFile, ob_get_contents(), $template->cacheTime);
             }