webstream-framework / WebStream

WebStream/Annotation/Base/IMethods.php

Spacing +1 added lines, -1 removed lines

@@ -18,5 +18,5 @@
      * @param Container 依存コンテナ
      * @param ReflectionMethod リフレクションメソッドオブジェクト
      */
-    public function onMethodInject(IAnnotatable &$instance, Container $container, \ReflectionMethod $method);
+    public function onMethodInject(IAnnotatable&$instance, Container $container, \ReflectionMethod $method);
 }

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 +5 added lines, -5 removed lines

@@ -68,11 +68,11 @@
     public function load()
     {
         $this->loadLogLevel()
-             ->loadLogFilePath()
-             ->loadRotateCycle()
-             ->loadRotateSize()
-             ->loadApplicationName()
-             ->loadFormat();
+                ->loadLogFilePath()
+                ->loadRotateCycle()
+                ->loadRotateSize()
+                ->loadApplicationName()
+                ->loadFormat();
     }
 
     /**

Spacing +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
         } else {
             $configMap = $this->parseConfig($config);
             if ($configMap === null) {
-                throw new LoggerException("Log config file does not exist: " . $config);
+                throw new LoggerException("Log config file does not exist: ".$config);
             }
         }
 
@@ -54,14 +54,14 @@ 
         $this->ioContainer = new Container();
 
         $rootDir = $this->getApplicationRoot();
-        $this->ioContainer->file = function () use ($rootDir, $configMap) {
+        $this->ioContainer->file = function() use ($rootDir, $configMap) {
             if (!array_key_exists("path", $configMap)) {
                 throw new LoggerException("Log path must be defined.");
             }
-            return new File($rootDir . "/" . $configMap["path"]);
+            return new File($rootDir."/".$configMap["path"]);
         };
-        $this->ioContainer->fileWriter = function () use ($rootDir, $configMap) {
-            return new SimpleFileWriter($rootDir . "/" . $configMap["path"]);
+        $this->ioContainer->fileWriter = function() use ($rootDir, $configMap) {
+            return new SimpleFileWriter($rootDir."/".$configMap["path"]);
         };
 
         $this->configMap = $configMap;
@@ -118,7 +118,7 @@ 
         }
 
         $this->logContainer->logPath = $file->getFilePath();
-        $this->logContainer->statusPath = preg_replace_callback('/(.*)\..+/', function ($matches) {
+        $this->logContainer->statusPath = preg_replace_callback('/(.*)\..+/', function($matches) {
             return "$matches[1].status";
         }, $this->logContainer->logPath);
 
@@ -148,7 +148,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;
         }
@@ -210,7 +210,7 @@ 
             case 'year':
                 return $year_to_h;
             default:
-                throw new LoggerException("Invalid log rotate cycle: " . $cycle);
+                throw new LoggerException("Invalid log rotate cycle: ".$cycle);
         }
     }
 }

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

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

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

Doc Comments +5 added lines, -1 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -75,13 +75,13 @@ 
 
         $this->ioContainer = new Container();
 
-        $this->ioContainer->statusReader = function () use ($statusFile) {
+        $this->ioContainer->statusReader = function() use ($statusFile) {
             return new FileReader($statusFile);
         };
-        $this->ioContainer->statusWriter = function () use ($statusFile) {
+        $this->ioContainer->statusWriter = function() use ($statusFile) {
             return new SimpleFileWriter($statusFile->getFilePath());
         };
-        $this->ioContainer->logWriter = function () use ($logFile) {
+        $this->ioContainer->logWriter = function() use ($logFile) {
             return new SimpleFileWriter($logFile->getFilePath());
         };
 
@@ -202,7 +202,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;
     }
 
     /**
@@ -240,7 +240,7 @@ 
                     $outputter->write(self::$formatter->getFormattedMessage($msg, $level));
                 }
             } else {
-                $this->ioContainer->logWriter->write(self::$formatter->getFormattedMessage($msg, $level) . PHP_EOL);
+                $this->ioContainer->logWriter->write(self::$formatter->getFormattedMessage($msg, $level).PHP_EOL);
             }
         } catch (LoggerException $e) {
             throw $e;
@@ -287,7 +287,7 @@ 
     {
         $content = $this->ioContainer->statusReader->read();
         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/Module/Utility/LoggerUtils.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
      */
     public function defaultLoggerFormatter()
     {
-        return '[%d{' . $this->defaultDateTimeFormatter() . '.%f}][%5L] %m';
+        return '[%d{'.$this->defaultDateTimeFormatter().'.%f}][%5L] %m';
     }
 
     /**
@@ -45,7 +45,7 @@ 
                 continue;
             }
             $msg .= PHP_EOL;
-            $msg .= "\t#" . trim($stacktraceLine);
+            $msg .= "\t#".trim($stacktraceLine);
         }
 
         return $msg;

WebStream/IO/File.php

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
     /**
      * constructor
-     * @param string $filepath ファイルパス
+     * @param string $filePath ファイルパス
      */
     public function __construct(stirng $filePath)
     {

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
             while (@is_link($filePath)) {
                 $linkPath = readlink($filePath);
                 if ($linkPath === false) {
-                    throw new IOException("Symbolic link read error: " . $filePath);
+                    throw new IOException("Symbolic link read error: ".$filePath);
                 }
                 $filePath = $linkPath;
             }
@@ -179,7 +179,7 @@ 
             $length = filesize($filePath);
 
             if ($length === false) {
-                throw new IOException("Cannot get filesize of " . $filePath);
+                throw new IOException("Cannot get filesize of ".$filePath);
             }
         }
 
@@ -229,10 +229,10 @@ 
         $dirname = dirname($destPath);
         $dir = new File($dirname);
         if (!$dir->isWritable()) {
-            throw new IOException("Cannot writable: " . $destPath);
+            throw new IOException("Cannot writable: ".$destPath);
         }
         $dirPath = $dir->getFilePath();
-        $absDestPath = $dirPath . "/" . basename($destPath);
+        $absDestPath = $dirPath."/".basename($destPath);
 
         return rename($this->filePath, $absDestPath);
     }

WebStream/IO/FileInputStream.php

Spacing +3 added lines, -3 removed lines

@@ -30,11 +30,11 @@ 
         } else if (is_string($file)) {
             $this->file = new File($file);
         } else {
-            throw new InvalidArgumentException("Unable to open file: " . $file);
+            throw new InvalidArgumentException("Unable to open file: ".$file);
         }
         $stream = @fopen($this->file->getAbsoluteFilePath(), 'r');
         if (!is_resource($stream) || $stream === false) {
-            throw new IOException("Unable open " . $this->file->getAbsoluteFilePath());
+            throw new IOException("Unable open ".$this->file->getAbsoluteFilePath());
         }
 
         parent::__construct($stream);
@@ -133,7 +133,7 @@ 
     public function reset()
     {
         if (!$this->isMarkSupported()) {
-            throw new IOException(get_class($this) . " does not support mark and reset.");
+            throw new IOException(get_class($this)." does not support mark and reset.");
         }
 
         // ポインタ位置をmark位置に移動

WebStream/IO/InputStream.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
     public function mark()
     {
         if (!$this->isMarkSupported()) {
-            throw new IOException(get_class($this) . " does not support mark.");
+            throw new IOException(get_class($this)." does not support mark.");
         }
 
         $this->markedPosition = $this->cursorPosition;
@@ -96,7 +96,7 @@ 
     public function reset()
     {
         if (!$this->isMarkSupported()) {
-            throw new IOException(get_class($this) . " does not support mark and reset.");
+            throw new IOException(get_class($this)." does not support mark and reset.");
         }
 
         // mark位置を初期値に戻す