webstream-framework / WebStream

WebStream/Log/Logger.php

Doc Comments +4 added lines, -1 removed lines

@@ -86,7 +86,7 @@ 
 
     /**
      * インスタンスを返却する
-     * @return WebStream\Module\Logger ロガーインスタンス
+     * @return Logger ロガーインスタンス
      */
     public static function getInstance()
     {
@@ -193,6 +193,7 @@ 
      * @param string ログレベル文字列
      * @param string 出力文字列
      * @param array<mixed> 埋め込み値リスト
+     * @param string $msg
      */
     public function write($level, $msg, $context = null)
     {
@@ -288,6 +289,8 @@ 
      * ローテートを実行する
      * @param integer 作成日時のUnixTime
      * @param integer 現在日時のUnixTime
+     * @param integer $from
+     * @param integer $to
      */
     private function runRotate($from, $to)
     {

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
  */
 
 use WebStream\Module\Security;
-use WebStream\DI\ServiceLocator;
 use WebStream\Log\Logger;
 
 /**

Spacing +3 added lines, -3 removed lines

@@ -164,7 +164,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;
     }
 
     /**
@@ -182,7 +182,7 @@ 
                 continue;
             }
             $msg .= "\n";
-            $msg .= "\t#" . trim($stacktraceLine);
+            $msg .= "\t#".trim($stacktraceLine);
         }
 
         return $msg;
@@ -248,7 +248,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/Log/LoggerConfigurationManager.php

Doc Comments +1 added lines

@@ -183,6 +183,7 @@
     /**
      * ログローテートサイクルを時間に変換
      * @param string ローテートサイクル
+     * @param string $cycle
      * @return int ローテート時間
      */
     private function cycle2value($cycle)

Indentation +6 added lines, -6 removed lines

@@ -43,12 +43,12 @@
     public function load($configPath)
     {
         $this->loadConfigFile($configPath)
-             ->loadLogLevel()
-             ->loadLogFilePath()
-             ->loadRotateCycle()
-             ->loadRotateSize()
-             ->loadApplicationName()
-             ->loadFormat();
+                ->loadLogLevel()
+                ->loadLogFilePath()
+                ->loadRotateCycle()
+                ->loadRotateSize()
+                ->loadApplicationName()
+                ->loadFormat();
     }
 
     /**

Spacing +7 added lines, -7 removed lines

@@ -69,7 +69,7 @@ 
     {
         $configMap = $this->parseConfig($configPath);
         if ($configMap === null) {
-            throw new LoggerException("Log config file does not exist: " . $configPath);
+            throw new LoggerException("Log config file does not exist: ".$configPath);
         }
         $this->configMap = $configMap;
 
@@ -88,7 +88,7 @@ 
 
         $logLevel = $this->toLogLevelValue($this->configMap["level"]);
         if ($logLevel === 0) {
-            throw new LoggerException("Invalid log level: " . $this->configMap["level"]);
+            throw new LoggerException("Invalid log level: ".$this->configMap["level"]);
         }
         $this->logContainer->logLevel = $logLevel;
 
@@ -105,13 +105,13 @@ 
             throw new LoggerException("Log path must be defined.");
         }
 
-        $path = $this->getApplicationRoot() . "/" . $this->configMap["path"];
+        $path = $this->getApplicationRoot()."/".$this->configMap["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->logContainer->logPath = $path;
 
-        $this->logContainer->statusPath = preg_replace_callback('/(.*)\..+/', function ($matches) {
+        $this->logContainer->statusPath = preg_replace_callback('/(.*)\..+/', function($matches) {
             return "$matches[1].status";
         }, $this->logContainer->logPath);
 
@@ -128,7 +128,7 @@ 
             $rotateCycle = $this->cycle2value($this->configMap["rotate_cycle"]);
             // 妥当なローテートサイクルか
             if ($rotateCycle === 0) {
-                throw new LoggerException("Invalid log rotate cycle: " . $this->configMap["rotate_cycle"]);
+                throw new LoggerException("Invalid log rotate cycle: ".$this->configMap["rotate_cycle"]);
             }
             $this->logContainer->rotateCycle = $rotateCycle;
         }
@@ -146,7 +146,7 @@ 
             $rotateSize = intval($this->configMap["rotate_size"]);
             // ローテートサイズが不正の場合(正の整数以外の値が設定された場合)
             if ($rotateSize <= 0) {
-                throw new LoggerException("Invalid log rotate size: " . $this->configMap["rotate_size"]);
+                throw new LoggerException("Invalid log rotate size: ".$this->configMap["rotate_size"]);
             }
             $this->logContainer->rotateSize = $rotateSize;
         }

WebStream/Log/LoggerFormatter.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * フォーマット済みメッセージを返却する
      * @param  string メッセージ
      * @param  string ログレベル
-     * @return フォーマット済みメッセージ
+     * @return string
      */
     public function getFormattedMessage($message, $logLevel)
     {

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         // メッセージ
         $formattedMessage = preg_replace('/%m/', $message, $formattedMessage);
 
-        return $formattedMessage . "\n";
+        return $formattedMessage."\n";
     }
 
     /**

WebStream/Module/ClassLoader.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 require_once dirname(__FILE__) . '/Utility/FileUtils.php';
 require_once dirname(__FILE__) . '/../DI/Injector.php';
 
-use WebStream\Module\Utility\ApplicationUtils;
 use WebStream\Module\Utility\FileUtils;
 use WebStream\DI\Injector;
 

Spacing +18 added lines, -18 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 namespace WebStream\Module;
 
-require_once dirname(__FILE__) . '/Utility/FileUtils.php';
-require_once dirname(__FILE__) . '/../DI/Injector.php';
+require_once dirname(__FILE__).'/Utility/FileUtils.php';
+require_once dirname(__FILE__).'/../DI/Injector.php';
 
 use WebStream\Module\Utility\ApplicationUtils;
 use WebStream\Module\Utility\FileUtils;
@@ -49,13 +49,13 @@ 
      */
     public function import($filepath, callable $filter = null)
     {
-        $includeFile = $this->applicationRoot . "/" . $filepath;
+        $includeFile = $this->applicationRoot."/".$filepath;
         if (is_file($includeFile)) {
             $ext = pathinfo($includeFile, PATHINFO_EXTENSION);
             if ($ext === 'php') {
                 if ($filter === null || (is_callable($filter) && $filter($includeFile) === true)) {
                     include_once $includeFile;
-                    $this->logger->debug($includeFile . " import success.");
+                    $this->logger->debug($includeFile." import success.");
                 }
             }
 
@@ -73,7 +73,7 @@ 
      */
     public function importAll($dirPath, callable $filter = null)
     {
-        $includeDir = realpath($this->applicationRoot . "/" . $dirPath);
+        $includeDir = realpath($this->applicationRoot."/".$dirPath);
         if (is_dir($includeDir)) {
             $iterator = $this->getFileSearchIterator($includeDir);
             $isSuccess = true;
@@ -86,11 +86,11 @@ 
                     if ($ext === 'php') {
                         if ($filter === null || (is_callable($filter) && $filter($filepath) === true)) {
                             include_once $filepath;
-                            $this->logger->debug($filepath . " import success.");
+                            $this->logger->debug($filepath." import success.");
                         }
                     }
                 } else {
-                    $this->logger->warn($filepath . " import failure.");
+                    $this->logger->warn($filepath." import failure.");
                     $isSuccess = false;
                 }
             }
@@ -116,22 +116,22 @@ 
         // まずcoreディレクトリを検索
         // coreディレクトリは名前空間とディレクトリパスが
         // 紐づいているのでそのまま連結して読ませる
-        $includeFile = $rootDir . "/core/" . $className . ".php";
+        $includeFile = $rootDir."/core/".$className.".php";
         if (is_file($includeFile)) {
             include_once $includeFile;
-            $this->logger->debug($includeFile . " load success. (search from " . $rootDir . "/core/)");
+            $this->logger->debug($includeFile." load success. (search from ".$rootDir."/core/)");
 
             return [$includeFile];
         }
 
         // さらに見つからなかったらappディレクトリを名前空間付きで全検索し、マッチするもの全てをincludeする
-        $iterator = $this->getFileSearchIterator($rootDir . "/app");
+        $iterator = $this->getFileSearchIterator($rootDir."/app");
         $includeList = [];
         foreach ($iterator as $filepath => $fileObject) {
-            if (strpos($filepath, $className . ".php") !== false) {
+            if (strpos($filepath, $className.".php") !== false) {
                 include_once $filepath;
                 $includeList[] = $filepath;
-                $this->logger->debug($filepath . " load success. (search from " . $rootDir . "/app/)");
+                $this->logger->debug($filepath." load success. (search from ".$rootDir."/app/)");
             }
         }
         if (!empty($includeList)) {
@@ -144,12 +144,12 @@ 
             $classNameWithoutNamespace = $matches[1];
             // この処理が走るケースはapp配下のクラスがディレクトリ構成と名前空間が一致していない
             // 場合以外ない(テスト用クラス除く)ので、app配下の検索を優先する
-            $iterator = $this->getFileSearchIterator($rootDir . "/app");
+            $iterator = $this->getFileSearchIterator($rootDir."/app");
             foreach ($iterator as $filepath => $fileObject) {
-                if (strpos($filepath, $classNameWithoutNamespace . ".php") !== false) {
+                if (strpos($filepath, $classNameWithoutNamespace.".php") !== false) {
                     include_once $filepath;
                     $includeList[] = $filepath;
-                    $this->logger->debug($filepath . " load success. (full search)");
+                    $this->logger->debug($filepath." load success. (full search)");
                 }
             }
             if (!empty($includeList)) {
@@ -157,12 +157,12 @@ 
             }
 
             // ここに到達するのはテスト用クラスのみ
-            $iterator = $this->getFileSearchIterator($rootDir . "/core");
+            $iterator = $this->getFileSearchIterator($rootDir."/core");
             foreach ($iterator as $filepath => $fileObject) {
-                if (strpos($filepath, $classNameWithoutNamespace . ".php") !== false) {
+                if (strpos($filepath, $classNameWithoutNamespace.".php") !== false) {
                     include_once $filepath;
                     $includeList[] = $filepath;
-                    $this->logger->debug($filepath . " load success. (full search, use in test)");
+                    $this->logger->debug($filepath." load success. (full search, use in test)");
                 }
             }
             if (!empty($includeList)) {

WebStream/Delegate/Router.php

Spacing +10 added lines, -10 removed lines

@@ -82,11 +82,11 @@ 
             // 静的ファイルへのパスがルーティングルールに定義された場合
             // パス定義された時点で弾く
             if (preg_match('/\/(img|js|css|file)(?:$|\/)/', $path)) {
-                throw new RouterException("Include the prohibit routing path: " . $path);
+                throw new RouterException("Include the prohibit routing path: ".$path);
             }
             // 許可したルーティングパス定義に合っていなければ弾く
             if (!preg_match('/^\/{1}(?:$|:?[a-zA-Z]{1}[a-zA-Z0-9-_\/\.:]{0,}$)/', $path)) {
-                throw new RouterException("Invalid path defintion: " . $path);
+                throw new RouterException("Invalid path defintion: ".$path);
             }
             // ルールとURLがマッチした場合に動的にチェックを掛ける
             // パスがマッチしたときにアクション名をチェックし、その時点で弾く
@@ -96,7 +96,7 @@ 
                 // NG例：my__blog, my_blog_
                 if (!preg_match('/^(?:([a-z]{1}(?:_(?=[a-z])|[a-z0-9])+))#(?:([a-z]{1}(?:_(?=[a-z])|[a-z0-9])+))$/', $ca, $matches)) {
                     // ルーティング定義(Controller#Action)が正しくない場合
-                    throw new RouterException("Invalid controller#action definition: " . $ca);
+                    throw new RouterException("Invalid controller#action definition: ".$ca);
                 }
             }
         }
@@ -129,7 +129,7 @@ 
             if (($this->request->pathInfo !== $path) &&
                 count(explode('/', $path)) === count(explode('/', $this->request->pathInfo))) {
                 // プレースホルダと実URLをひもづける
-                $pathPattern = "/^\/" . implode("\/", $tokens) . "$/";
+                $pathPattern = "/^\/".implode("\/", $tokens)."$/";
                 if (preg_match($pathPattern, $this->request->pathInfo, $matches)) {
                     for ($j = 1; $j < count($matches); $j++) {
                         $key = $keyList[$j - 1];
@@ -146,7 +146,7 @@ 
                 $this->setController($matches[1]);
                 $this->setAction($matches[2]);
                 $this->routingContainer->params = $placeholderedParams;
-                $this->logger->info("Routed path: " . $matches[1] . "#" . $matches[2]);
+                $this->logger->info("Routed path: ".$matches[1]."#".$matches[2]);
 
                 // ルーティングルールがマッチした場合は抜ける
                 return true;
@@ -161,7 +161,7 @@ 
      */
     private function resolveStaticFilePath()
     {
-        $staticFile = $this->applicationInfo->applicationRoot . "/app/views/" . $this->applicationInfo->publicDir .  $this->request->pathInfo;
+        $staticFile = $this->applicationInfo->applicationRoot."/app/views/".$this->applicationInfo->publicDir.$this->request->pathInfo;
 
         if (is_file($staticFile)) {
             $this->routingContainer->staticFile = $staticFile;
@@ -170,10 +170,10 @@ 
             $less = new \lessc();
             $dirpath = dirname($staticFile);
             $filenameWitoutExt = pathinfo($staticFile, PATHINFO_FILENAME);
-            $lessFilepath = $dirpath . "/" . $filenameWitoutExt . ".less";
+            $lessFilepath = $dirpath."/".$filenameWitoutExt.".less";
             // lessファイルも見つからない場合はエラー
             if (!file_exists($lessFilepath)) {
-                $this->logger->error("The file of css has been specified, but not found even file of less:" . $lessFilepath);
+                $this->logger->error("The file of css has been specified, but not found even file of less:".$lessFilepath);
 
                 return;
             }
@@ -181,7 +181,7 @@ 
                 if (is_file($staticFile)) {
                     $this->routingContainer->staticFile = $staticFile;
                 } else {
-                    $this->logger->error("Failed to file create, cause parmission denied: " . $dirpath);
+                    $this->logger->error("Failed to file create, cause parmission denied: ".$dirpath);
                 }
             }
         }
@@ -195,7 +195,7 @@ 
     {
         if (isset($controller)) {
             $this->routingContainer->pageName = $this->snake2ucamel($controller);
-            $this->routingContainer->controller = $this->snake2ucamel($controller) . "Controller";
+            $this->routingContainer->controller = $this->snake2ucamel($controller)."Controller";
         }
     }
 

WebStream/Log/Outputter/BrowserOutputter.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         $sapi = php_sapi_name();
         if (array_key_exists($sapi, $this->sapis) && $this->sapis[$sapi] === 'http') {
-            echo $text . "<br>";
+            echo $text."<br>";
         }
     }
 }

WebStream/Log/Outputter/ConsoleOutputter.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         $sapi = php_sapi_name();
         if (array_key_exists($sapi, $this->sapis) && $this->sapis[$sapi] === 'console') {
-            echo $text . PHP_EOL;
+            echo $text.PHP_EOL;
         }
     }
 }