webstream-framework / WebStream

WebStream/Core/CoreView.php

Spacing +4 added lines, -4 removed lines

@@ -120,11 +120,11 @@
     final public function __file($filepath)
     {
         $publicDir = $this->container->applicationInfo->publicDir;
-        if (preg_match('/\/views\/' . $publicDir . '\/img\/.+\.(?:jp(?:e|)g|png|bmp|(?:tif|gi)f)$/i', $filepath) ||
-            preg_match('/\/views\/' . $publicDir . '\/css\/.+\.css$/i', $filepath) ||
-            preg_match('/\/views\/' . $publicDir . '\/js\/.+\.js$/i', $filepath)) { // 画像,css,jsの場合
+        if (preg_match('/\/views\/'.$publicDir.'\/img\/.+\.(?:jp(?:e|)g|png|bmp|(?:tif|gi)f)$/i', $filepath) ||
+            preg_match('/\/views\/'.$publicDir.'\/css\/.+\.css$/i', $filepath) ||
+            preg_match('/\/views\/'.$publicDir.'\/js\/.+\.js$/i', $filepath)) { // 画像,css,jsの場合
             $this->display($filepath);
-        } elseif (preg_match('/\/views\/' . $publicDir . '\/file\/.+$/i', $filepath)) { // それ以外のファイル
+        } elseif (preg_match('/\/views\/'.$publicDir.'\/file\/.+$/i', $filepath)) { // それ以外のファイル
             $this->download($filepath);
         } else { // 全てのファイル
             $this->display($filepath);

WebStream/Database/Driver/Sqlite.php

Spacing +1 added lines, -1 removed lines

@@ -31,6 +31,6 @@
         ]);
 
         $this->connection = DriverManager::getConnection($params, $config);
-        $this->logger->debug(get_class($this) . " connect.");
+        $this->logger->debug(get_class($this)." connect.");
     }
 }

WebStream/Delegate/AnnotationDelegatorFactory.php

Spacing +10 added lines, -10 removed lines

@@ -103,7 +103,7 @@ 
             unset($injectedAnnotation[$annotationKey]);
         }
 
-        return function () use ($injectedAnnotation) {
+        return function() use ($injectedAnnotation) {
             return $injectedAnnotation;
         };
     }
@@ -115,7 +115,7 @@ 
      */
     private function createHeader($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $headerContainer = new Container();
             $headerContainer->mimeType = "html";
             if ($containerList !== null) {
@@ -133,7 +133,7 @@ 
      */
     private function createFilter($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $filterListContainer = new Container();
             $filterListContainer->initialize = new AnnotationListContainer();
             $filterListContainer->before     = new AnnotationListContainer();
@@ -145,7 +145,7 @@ 
                 // アクションメソッドの@Filter(type="skip")をチェックする
                 // 1メソッドに対して複数の@Filterが指定されてもエラーにはしない
                 foreach ($containerList as $filterAnnotation) {
-                    if ($filterAnnotation->classpath . "#" . $filterAnnotation->action === $filterAnnotation->method->class . "#" . $filterAnnotation->method->name) {
+                    if ($filterAnnotation->classpath."#".$filterAnnotation->action === $filterAnnotation->method->class."#".$filterAnnotation->method->name) {
                         if ($filterAnnotation->annotation->type === 'skip') {
                             $exceptMethods = $filterAnnotation->annotation->except;
                             if (!is_array($exceptMethods)) {
@@ -217,7 +217,7 @@ 
      */
     private function createTemplate($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $templateContainer = new Container(false);
             $templateContainer->engine = $containerList !== null ? $containerList[0]->engine : null;
             $templateContainer->cacheTime = $containerList !== null ? $containerList[0]->cacheTime : null;
@@ -233,7 +233,7 @@ 
      */
     private function createExceptionHandler($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList === null ? [] : $containerList;
         };
     }
@@ -245,7 +245,7 @@ 
      */
     private function createDatabase($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList;
         };
     }
@@ -257,7 +257,7 @@ 
      */
     private function createQuery($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList;
         };
     }
@@ -269,8 +269,8 @@ 
      */
     private function createAlias($containerList)
     {
-        return function () use ($containerList) {
-            return $containerList === null ? [] : $containerList;;
+        return function() use ($containerList) {
+            return $containerList === null ? [] : $containerList; ;
         };
     }
 }

Doc Comments +11 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * Constructor
      * @param array<string> 注入後の返却情報
-     * @param Container 依存コンテナ
+     * @param Container Container
      */
     public function __construct(array $injectedAnnotation, Container $container)
     {
@@ -56,7 +56,8 @@ 
     /**
      * CustomAnnotation結果を返却する
      * @param  string アノテーションID
-     * @return Callable CustomAnnotation結果
+     * @param string $annotationId
+     * @return \Closure CustomAnnotation結果
      */
     public function createAnnotationCallable($annotationId)
     {
@@ -95,7 +96,7 @@ 
 
     /**
      * CustomAnnotation結果を返却する
-     * @return Callable CustomAnnotation結果
+     * @return \Closure CustomAnnotation結果
      */
     public function createCustomAnnotationCallable()
     {
@@ -112,7 +113,7 @@ 
     /**
      * Header結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Header結果
+     * @return \Closure Header結果
      */
     private function createHeader($containerList)
     {
@@ -130,7 +131,7 @@ 
     /**
      * Filter結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Filter結果
+     * @return \Closure Filter結果
      */
     private function createFilter($containerList)
     {
@@ -214,7 +215,7 @@ 
     /**
      * Template結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Template結果
+     * @return \Closure Template結果
      */
     private function createTemplate($containerList)
     {
@@ -230,7 +231,7 @@ 
     /**
      * ExceptionHandler結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable ExceptionHandler結果
+     * @return \Closure ExceptionHandler結果
      */
     private function createExceptionHandler($containerList)
     {
@@ -242,7 +243,7 @@ 
     /**
      * Database結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Database結果
+     * @return \Closure Database結果
      */
     private function createDatabase($containerList)
     {
@@ -254,7 +255,7 @@ 
     /**
      * Query結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Query結果
+     * @return \Closure Query結果
      */
     private function createQuery($containerList)
     {
@@ -266,7 +267,7 @@ 
     /**
      * Alias結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Alias結果
+     * @return \Closure Alias結果
      */
     private function createAlias($containerList)
     {

WebStream/Delegate/ExceptionDelegator.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
                         // そうでなければ複数回メソッドが実行されるため
                         // ただし同一クラス内に限る(親クラスの同一名のメソッドは実行する)
                         // TODO ここはテストを追加する
-                        $classpath = $refMethod->class . "#" . $refMethod->name;
+                        $classpath = $refMethod->class."#".$refMethod->name;
                         if (!array_key_exists($classpath, $invokeMethods)) {
                             $invokeMethods[$classpath] = $refMethod;
                         }
@@ -100,7 +100,7 @@ 
             foreach ($invokeMethods as $classpath => $invokeMethod) {
                 $params = ["class" => get_class($this->instance), "method" => $this->method, "exception" => $originException];
                 $invokeMethod->invokeArgs($this->instance, [$params]);
-                $this->logger->debug("Execution of handling is success: " . $classpath);
+                $this->logger->debug("Execution of handling is success: ".$classpath);
             }
 
             throw $delegateException ?: $originException;

WebStream/Delegate/CoreExceptionDelegator.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         if (class_exists($this->classpath)) {
             throw new $this->classpath($this->message);
         } else {
-            throw new ClassNotFoundException($this->classpath . " is not found.");
+            throw new ClassNotFoundException($this->classpath." is not found.");
         }
     }
 }

WebStream/Template/Twig.php

Spacing +3 added lines, -3 removed lines

@@ -41,8 +41,8 @@ 
     {
         $applicationInfo = $this->container->applicationInfo;
         $dirname = $this->camel2snake($this->container->router->pageName);
-        $templateDir = $applicationInfo->applicationRoot . "/app/views/" . $dirname;
-        $sharedDir = $applicationInfo->applicationRoot . "/app/views/" . $applicationInfo->sharedDir;
+        $templateDir = $applicationInfo->applicationRoot."/app/views/".$dirname;
+        $sharedDir = $applicationInfo->applicationRoot."/app/views/".$applicationInfo->sharedDir;
 
         if (is_dir($templateDir)) {
             $this->loader->addPath($templateDir);
@@ -53,7 +53,7 @@ 
 
         $escaper = new \Twig_Extension_Escaper(true);
         $twig = new \Twig_Environment($this->loader, [
-            'cache' => $applicationInfo->applicationRoot . "/app/views/" . $applicationInfo->cacheDir,
+            'cache' => $applicationInfo->applicationRoot."/app/views/".$applicationInfo->cacheDir,
             'auto_reload' => true,
             'debug' => $this->container->debug
         ]);

WebStream/Module/Security.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         // 制御文字削除
         $removes = [];
         $removes[] = '/%0[0-8bcef]/'; // 00-08, 11, 12, 14, 15
-        $removes[] = '/%1[0-9a-f]/';  // 16-31
+        $removes[] = '/%1[0-9a-f]/'; // 16-31
         $removes[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
         // $dataが数行にわたっている場合、一度で置換しきれないので繰り返す

WebStream/Module/Utility/CommonUtils.php

Spacing +3 added lines, -3 removed lines

@@ -74,8 +74,8 @@ 
      */
     public function camel2snake($str)
     {
-        $str = preg_replace_callback('/([A-Z])/', function ($matches) {
-            return '_' . lcfirst($matches[1]);
+        $str = preg_replace_callback('/([A-Z])/', function($matches) {
+            return '_'.lcfirst($matches[1]);
         }, $str);
 
         return preg_replace('/^_/', '', $str);
@@ -88,7 +88,7 @@ 
      */
     public function snake2ucamel($str)
     {
-        $str = ucfirst(preg_replace_callback('/_([a-zA-Z])/', function ($matches) {
+        $str = ucfirst(preg_replace_callback('/_([a-zA-Z])/', function($matches) {
             return ucfirst($matches[1]);
         }, $str));
 

WebStream/Module/Utility/FileUtils.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public function parseConfig($filepath)
     {
         // 正規化した絶対パス
-        $realpath = $this->getApplicationRoot() . DIRECTORY_SEPARATOR . $filepath;
+        $realpath = $this->getApplicationRoot().DIRECTORY_SEPARATOR.$filepath;
 
         return file_exists($realpath) ? parse_ini_file($realpath) : null;
     }