webstream-framework / WebStream

WebStream/Exception/ApplicationException.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
             $exception = $this;
         }
 
-        Logger::error(get_class($exception) . " is thrown: " . $exception->getFile() . "(" . $exception->getLine() . ")");
+        Logger::error(get_class($exception)." is thrown: ".$exception->getFile()."(".$exception->getLine().")");
         if (!empty($message)) {
             Logger::error($this->getMessage(), $this->getTraceAsString());
         }

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/Http/Response.php

Spacing +18 added lines, -18 removed lines

@@ -155,11 +155,11 @@ 
     public function setStatusCode($statusCode)
     {
         if (!is_string($statusCode) && !is_int($statusCode)) {
-            throw new ConnectionException("Invalid status code format: " . strval($statusCode));
+            throw new ConnectionException("Invalid status code format: ".strval($statusCode));
         }
 
         if (!array_key_exists($statusCode, $this->status)) {
-            throw new ConnectionException("Unknown status code: " . $statusCode);
+            throw new ConnectionException("Unknown status code: ".$statusCode);
         }
         $this->statusCode = $statusCode;
     }
@@ -180,7 +180,7 @@ 
     public function setContentDisposition($filename)
     {
         if (file_exists($filename)) {
-            $this->contentDisposition = 'attachement; filename="'. basename($filename) . '"';
+            $this->contentDisposition = 'attachement; filename="'.basename($filename).'"';
         }
     }
 
@@ -235,43 +235,43 @@ 
     public function header()
     {
         // StatusCode
-        $headerMessage = 'HTTP/' . self::HTTP_VERSION . ' ' .
-                         $this->statusCode . ' ' . $this->status[$this->statusCode];
+        $headerMessage = 'HTTP/'.self::HTTP_VERSION.' '.
+                         $this->statusCode.' '.$this->status[$this->statusCode];
         header($headerMessage);
 
         // Redirect
         if (intval($this->statusCode) === 301) {
-            header('Location: ' . $this->location);
+            header('Location: '.$this->location);
         }
 
         // Content-Type
-        header('Content-Type: ' . $this->mimeType . '; charset=' . $this->charset);
+        header('Content-Type: '.$this->mimeType.'; charset='.$this->charset);
 
         // Content-Length
         if ($this->contentLength === null) {
             $this->contentLength = $this->bytelen($this->body);
         }
-        header('Content-Length: ' . $this->contentLength);
+        header('Content-Length: '.$this->contentLength);
 
         // Content-Disposition
         if ($this->contentDisposition !== null) {
-            header('Content-Disposition: ' . $this->contentDisposition);
+            header('Content-Disposition: '.$this->contentDisposition);
         }
 
         // Content-Transfer-Encoding
         if ($this->contentTransferEncoding !== null) {
-            header('Content-Transfer-Encoding: ' . $this->contentTransferEncoding);
+            header('Content-Transfer-Encoding: '.$this->contentTransferEncoding);
         }
 
         // Cache-Control
-        header('Cache-Control: ' . $this->cacheControl);
+        header('Cache-Control: '.$this->cacheControl);
 
         // Pragma
-        header('Pragma: ' . $this->pragma);
+        header('Pragma: '.$this->pragma);
 
         // Expires
         if ($this->expires !== null) {
-            header('Expires: ' . $this->expires);
+            header('Expires: '.$this->expires);
         }
 
         // X-Content-Type-Options
@@ -279,20 +279,20 @@ 
 
         // Access-Control-Allow-Origin
         if (!empty($this->accessControlAllowOrigin)) {
-            header('Access-Control-Allow-Origin: ' . implode(',', $this->accessControlAllowOrigin));
+            header('Access-Control-Allow-Origin: '.implode(',', $this->accessControlAllowOrigin));
         }
 
         // X-Frame-Options
         if ($this->xframeOptions !== null) {
-            header('X-Frame-Options: ' . $this->xframeOptions);
+            header('X-Frame-Options: '.$this->xframeOptions);
         }
 
         // X-XSS-Protection
         if ($this->xxssProtection !== null) {
-            header('X-XSS-Protection: ' . $this->xxssProtection);
+            header('X-XSS-Protection: '.$this->xxssProtection);
         }
 
-        $this->logger->info("HTTP access occured: status code " . $this->statusCode);
+        $this->logger->info("HTTP access occured: status code ".$this->statusCode);
     }
 
     /**
@@ -510,7 +510,7 @@ 
         ob_clean(); // これまでの出力バッファをクリア
         $statusCode = array_key_exists($statusCode, $this->status) ? $statusCode : 500;
         $this->setStatusCode($statusCode);
-        $bodyMessage = $statusCode . ' ' . $this->status[$statusCode];
+        $bodyMessage = $statusCode.' '.$this->status[$statusCode];
         $this->setBody($this->bodyTemplate($bodyMessage));
         $this->send();
         exit;

WebStream/Database/ConnectionManager.php

Spacing +2 added lines, -2 removed lines

@@ -77,14 +77,14 @@
             $dsnHash = "";
             $databaseConfigContainer = new Container(false);
             foreach ($config as $key => $value) {
-                $dsnHash .= $key . $value;
+                $dsnHash .= $key.$value;
                 $databaseConfigContainer->set($key, $value);
             }
             $dsnHash = md5($dsnHash);
 
             $this->classpathMap[$container->filepath] = $dsnHash;
 
-            $this->connectionContainer->{$dsnHash} = function () use ($driverClassPath, $databaseConfigContainer, $logger) {
+            $this->connectionContainer->{$dsnHash} = function() use ($driverClassPath, $databaseConfigContainer, $logger) {
                 $driver = new $driverClassPath($databaseConfigContainer);
                 $driver->inject('logger', $logger);
 

WebStream/Database/Query.php

Spacing +2 added lines, -2 removed lines

@@ -120,9 +120,9 @@
         try {
             $stmt = $this->driver->getStatement($this->sql);
             if ($stmt === false) {
-                throw new DatabaseException("Can't create statement: ". $this->sql);
+                throw new DatabaseException("Can't create statement: ".$this->sql);
             }
-            $this->logger->info("Executed SQL: " . $this->sql);
+            $this->logger->info("Executed SQL: ".$this->sql);
             foreach ($this->bind as $key => $value) {
                 $this->logger->info("Bind statement: $key => $value");
                 if (preg_match("/^[0-9]+$/", $value) && is_int($value)) {

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

WebStream/Delegate/AnnotationDelegator.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     public function read($instance, $method = null, $classpath = null)
     {
         if (!$instance instanceof IAnnotatable) {
-            $this->logger->warn("Annotation is not available this class: " . get_class($instance));
+            $this->logger->warn("Annotation is not available this class: ".get_class($instance));
             return;
         }
 

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;