webstream-framework / WebStream

WebStream/IO/Writer/SimpleFileWriter.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
         $dirname = dirname($filepath);
         $dir = new File($dirname);
         if (!$dir->isWritable()) {
-            throw new IOException("Cannot writable: " . $filepath);
+            throw new IOException("Cannot writable: ".$filepath);
         }
 
         $this->filepath = $filepath;
@@ -60,11 +60,11 @@ 
         }
 
         if (!is_resource($stream) || $stream === false) {
-            throw new IOException("Unable open " . $this->filepath);
+            throw new IOException("Unable open ".$this->filepath);
         }
 
-        if (!flock($stream, LOCK_EX | LOCK_NB)) {
-            throw new IOException("Cannot lock file: " . $this->filepath);
+        if (!flock($stream, LOCK_EX|LOCK_NB)) {
+            throw new IOException("Cannot lock file: ".$this->filepath);
         }
 
         if (fwrite($stream, $data) === false) {

WebStream/IO/FileOutputStream.php

Spacing +5 added lines, -5 removed lines

@@ -35,24 +35,24 @@
                 $dirname = dirname($filepath);
                 $dir = new File($dirname);
                 if (!$dir->isWritable()) {
-                    throw new IOException("Cannot writable: " . $filepath);
+                    throw new IOException("Cannot writable: ".$filepath);
                 }
             }
             $this->file = new File($file);
             $filepath = $this->file->getFilePath();
         } else {
-            throw new InvalidArgumentException("Invalid argument type: " . $file);
+            throw new InvalidArgumentException("Invalid argument type: ".$file);
         }
 
         $mode = $isAppend ? 'ab' : 'wb';
         $stream = fopen($filepath, $mode);
 
         if (!is_resource($stream) || $stream === false) {
-            throw new IOException("Unable open " . $this->file->getFilePath());
+            throw new IOException("Unable open ".$this->file->getFilePath());
         }
 
-        if (!flock($stream, LOCK_EX | LOCK_NB)) {
-            throw new IOException("Cannot lock file: " . $this->file->getFilePath());
+        if (!flock($stream, LOCK_EX|LOCK_NB)) {
+            throw new IOException("Cannot lock file: ".$this->file->getFilePath());
         }
 
         parent::__construct($stream);

WebStream/Core/CoreInterface.php

Indentation +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
     public function __initialize(Container $container);
 
     /**
-    * カスタムアノテーション情報を設定する
-    * @param array<mixed> カスタムアノテーション情報
+     * カスタムアノテーション情報を設定する
+     * @param array<mixed> カスタムアノテーション情報
      */
     public function __customAnnotation(array $annotation);
 }

WebStream/Core/CoreHelper.php

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     }
 
     /**
-    * {@inheritdoc}
+     * {@inheritdoc}
      */
     public function __customAnnotation(array $annotation)
     {

Spacing +2 added lines, -2 removed lines

@@ -95,8 +95,8 @@
     public function async($path, $id)
     {
         $safetyPath = str_replace('\\', '', $this->encodeJavaScript($path));
-        $url = "//" . $this->container->request->httpHost . $this->container->request->baseUri . $safetyPath;
+        $url = "//".$this->container->request->httpHost.$this->container->request->baseUri.$safetyPath;
 
-        return "<script type='text/javascript'>" . $this->asyncHelperCode($url, $id) . "</script>";
+        return "<script type='text/javascript'>".$this->asyncHelperCode($url, $id)."</script>";
     }
 }

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 +14 added lines, -15 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,11 +41,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;
     }
@@ -58,13 +57,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;
         }
 
@@ -79,13 +78,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;
         }
     }
@@ -100,17 +99,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;
         }
     }