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/EntityManager.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,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/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/CoreExecuteDelegator.php

Spacing +3 added lines, -3 removed lines

@@ -180,8 +180,8 @@ 
 
         // テンプレートキャッシュチェック
         $pageName = $this->container->coreDelegator->getPageName();
-        $cacheFile = $applicationInfo->cachePrefix . $this->camel2snake($pageName) . "-" . $this->camel2snake($method);
-        $cache = new Cache($applicationInfo->applicationRoot . "/app/views/" . $applicationInfo->cacheDir);
+        $cacheFile = $applicationInfo->cachePrefix.$this->camel2snake($pageName)."-".$this->camel2snake($method);
+        $cache = new Cache($applicationInfo->applicationRoot."/app/views/".$applicationInfo->cacheDir);
         $cache->inject('logger', $this->logger);
         $data = $cache->get($cacheFile);
 
@@ -248,7 +248,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);
             }
 

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