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/Log/LoggerFormatter.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
         // メッセージ
         $formattedMessage = preg_replace('/%m/', $message, $formattedMessage);
 
-        return $formattedMessage . "\n";
+        return $formattedMessage."\n";
     }
 
     /**
@@ -69,7 +69,7 @@ 
 
         // 設定ファイルが存在するかどうか
         if ($log === null) {
-            throw new LoggerException("Log config file does not exist: " . $configPath);
+            throw new LoggerException("Log config file does not exist: ".$configPath);
         }
 
         // ログアプリケーション名

WebStream/Log/Logger.php

Spacing +10 added lines, -10 removed lines

@@ -139,14 +139,14 @@ 
 
         // 設定ファイルが存在するかどうか
         if ($log === null) {
-            throw new LoggerException("Log config file does not exist: " . $configPath);
+            throw new LoggerException("Log config file does not exist: ".$configPath);
         }
 
         // ログレベル取得
         $logLevel = $this->toLogLevelValue($log["level"]);
         // 妥当なログレベルかどうか
         if ($logLevel === 0) {
-            throw new LoggerException("Invalid log level: " . $log["level"]);
+            throw new LoggerException("Invalid log level: ".$log["level"]);
         }
         $this->logLevel = $logLevel;
 
@@ -155,16 +155,16 @@ 
         // 絶対パスでのチェック
         if (!realpath(dirname($path))) {
             $container = ServiceLocator::getInstance()->getContainer();
-            $path = $container->applicationInfo->applicationRoot . "/" . $log["path"];
+            $path = $container->applicationInfo->applicationRoot."/".$log["path"];
             // プロジェクトルートからの相対パスでのチェック
             if (!file_exists(dirname($path))) {
-                throw new LoggerException("Log directory does not exist: " . dirname($path));
+                throw new LoggerException("Log directory does not exist: ".dirname($path));
             }
         }
         $this->logPath = $path;
 
         // ステータスファイルパスを設定
-        $this->statusPath = preg_replace_callback('/(.*)\..+/', function ($matches) {
+        $this->statusPath = preg_replace_callback('/(.*)\..+/', function($matches) {
             return "$matches[1].status";
         }, $this->logPath);
 
@@ -173,7 +173,7 @@ 
             $rotateCycle = $this->cycle2value($log["rotate_cycle"]);
             // 妥当なローテートサイクルか
             if ($rotateCycle === 0) {
-                throw new LoggerException("Invalid log rotate cycle: " . $log["rotate_cycle"]);
+                throw new LoggerException("Invalid log rotate cycle: ".$log["rotate_cycle"]);
             }
             $this->rotateCycle = $rotateCycle;
         }
@@ -183,7 +183,7 @@ 
             $rotateSize = intval($log["rotate_size"]);
             // ローテートサイズが不正の場合(正の整数以外の値が設定された場合)
             if ($rotateSize <= 0) {
-                throw new LoggerException("Invalid log rotate size: " . $log["rotate_size"]);
+                throw new LoggerException("Invalid log rotate size: ".$log["rotate_size"]);
             }
             $this->rotateSize = $rotateSize;
         }
@@ -262,7 +262,7 @@ 
         date_default_timezone_set('Asia/Tokyo');
         $msec = sprintf("%2d", floatval(microtime()) * 100);
 
-        return strftime("%Y-%m-%d %H:%M:%S") . "," . $msec;
+        return strftime("%Y-%m-%d %H:%M:%S").",".$msec;
     }
 
     /**
@@ -280,7 +280,7 @@ 
                 continue;
             }
             $msg .= "\n";
-            $msg .= "\t#" . trim($stacktraceLine);
+            $msg .= "\t#".trim($stacktraceLine);
         }
 
         return $msg;
@@ -341,7 +341,7 @@ 
         $content = fread($handle, $size);
         fclose($handle);
         if (!preg_match('/^\d{10}$/', $content)) {
-            throw new LoggerException("Invalid log state file contents: " . $content);
+            throw new LoggerException("Invalid log state file contents: ".$content);
         }
 
         return intval($content);

WebStream/Core/CoreHelper.php

Spacing +2 added lines, -2 removed lines

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

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/Core/CoreModel.php

Spacing +7 added lines, -7 removed lines

@@ -164,7 +164,7 @@ 
                         $result = $this->manager->query($sql)->{$method}();
                     }
                 } else {
-                    throw new DatabaseException("Invalid SQL or bind parameters: " . $sql .", " . strval($bind));
+                    throw new DatabaseException("Invalid SQL or bind parameters: ".$sql.", ".strval($bind));
                 }
             } else {
                 $bind = null;
@@ -185,7 +185,7 @@ 
                     }
                 }
 
-                $queryKey = $this->classpath . "#" . $modelMethod;
+                $queryKey = $this->classpath."#".$modelMethod;
                 $queryId = $method;
 
                 $refClass = new \ReflectionClass($this);
@@ -224,7 +224,7 @@ 
 
                 if ($entityClassPath !== null) {
                     if (!class_exists($entityClassPath)) {
-                        throw new DatabaseException("Entity classpath is not found: " . $entityClassPath);
+                        throw new DatabaseException("Entity classpath is not found: ".$entityClassPath);
                     }
 
                     switch ($method) {
@@ -236,9 +236,9 @@ 
                                     $result = $this->manager->query($sql)->select()->toEntity($entityClassPath);
                                 }
                             } else {
-                                $errorMessage = "Invalid SQL or bind parameters: " . $sql;
+                                $errorMessage = "Invalid SQL or bind parameters: ".$sql;
                                 if (is_array($bind)) {
-                                    $errorMessage .= ", " . strval($bind);
+                                    $errorMessage .= ", ".strval($bind);
                                 }
 
                                 throw new DatabaseException($errorMessage);
@@ -262,9 +262,9 @@ 
                             $result = $this->manager->query($sql)->{$method}();
                         }
                     } else {
-                        $errorMessage = "Invalid SQL or bind parameters: " . $sql;
+                        $errorMessage = "Invalid SQL or bind parameters: ".$sql;
                         if (is_array($bind)) {
-                            $errorMessage .= ", " . strval($bind);
+                            $errorMessage .= ", ".strval($bind);
                         }
 
                         throw new DatabaseException($errorMessage);

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