@@ -35,7 +35,7 @@ |
||
35 | 35 | * フォーマット済みメッセージを返却する |
36 | 36 | * @param string メッセージ |
37 | 37 | * @param string ログレベル |
38 | - * @return フォーマット済みメッセージ |
|
38 | + * @return string |
|
39 | 39 | */ |
40 | 40 | public function getFormattedMessage($message, $logLevel) |
41 | 41 | { |
@@ -49,7 +49,7 @@ |
||
49 | 49 | // メッセージ |
50 | 50 | $formattedMessage = preg_replace('/%m/', $message, $formattedMessage); |
51 | 51 | |
52 | - return $formattedMessage . PHP_EOL; |
|
52 | + return $formattedMessage.PHP_EOL; |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -32,7 +32,7 @@ |
||
32 | 32 | { |
33 | 33 | $sapi = php_sapi_name(); |
34 | 34 | if (array_key_exists($sapi, $this->sapis) && $this->sapis[$sapi] === 'http') { |
35 | - echo $text . "<br>"; |
|
35 | + echo $text."<br>"; |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | |
86 | 86 | /** |
87 | 87 | * インスタンスを返却する |
88 | - * @return WebStream\Module\Logger ロガーインスタンス |
|
88 | + * @return Logger ロガーインスタンス |
|
89 | 89 | */ |
90 | 90 | public static function getInstance() |
91 | 91 | { |
@@ -171,6 +171,8 @@ discard block |
||
171 | 171 | * @param string ログレベル文字列 |
172 | 172 | * @param string 出力文字列 |
173 | 173 | * @param array<mixed> 埋め込み値リスト |
174 | + * @param integer $level |
|
175 | + * @param string $msg |
|
174 | 176 | */ |
175 | 177 | public function write($level, $msg, $context = null) |
176 | 178 | { |
@@ -267,6 +269,8 @@ discard block |
||
267 | 269 | * ローテートを実行する |
268 | 270 | * @param integer 作成日時のUnixTime |
269 | 271 | * @param integer 現在日時のUnixTime |
272 | + * @param integer $from |
|
273 | + * @param integer $to |
|
270 | 274 | */ |
271 | 275 | private function runRotate($from, $to) |
272 | 276 | { |
@@ -75,13 +75,13 @@ discard block |
||
75 | 75 | |
76 | 76 | $this->ioContainer = new Container(); |
77 | 77 | |
78 | - $this->ioContainer->statusReader = function () use ($statusFile) { |
|
78 | + $this->ioContainer->statusReader = function() use ($statusFile) { |
|
79 | 79 | return new FileReader($statusFile); |
80 | 80 | }; |
81 | - $this->ioContainer->statusWriter = function () use ($statusFile) { |
|
81 | + $this->ioContainer->statusWriter = function() use ($statusFile) { |
|
82 | 82 | return new SimpleFileWriter($statusFile->getFilePath()); |
83 | 83 | }; |
84 | - $this->ioContainer->logWriter = function () use ($logFile) { |
|
84 | + $this->ioContainer->logWriter = function() use ($logFile) { |
|
85 | 85 | return new SimpleFileWriter($logFile->getFilePath()); |
86 | 86 | }; |
87 | 87 | |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | date_default_timezone_set('Asia/Tokyo'); |
203 | 203 | $msec = sprintf("%2d", floatval(microtime()) * 100); |
204 | 204 | |
205 | - return strftime("%Y-%m-%d %H:%M:%S") . "," . $msec; |
|
205 | + return strftime("%Y-%m-%d %H:%M:%S").",".$msec; |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $outputter->write(self::$formatter->getFormattedMessage($msg, $level)); |
241 | 241 | } |
242 | 242 | } else { |
243 | - $this->ioContainer->logWriter->write(self::$formatter->getFormattedMessage($msg, $level) . PHP_EOL); |
|
243 | + $this->ioContainer->logWriter->write(self::$formatter->getFormattedMessage($msg, $level).PHP_EOL); |
|
244 | 244 | } |
245 | 245 | } catch (LoggerException $e) { |
246 | 246 | throw $e; |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | { |
288 | 288 | $content = $this->ioContainer->statusReader->read(); |
289 | 289 | if (!preg_match('/^\d{10}$/', $content)) { |
290 | - throw new LoggerException("Invalid log state file contents: " . $content); |
|
290 | + throw new LoggerException("Invalid log state file contents: ".$content); |
|
291 | 291 | } |
292 | 292 | |
293 | 293 | return intval($content); |
@@ -30,7 +30,7 @@ |
||
30 | 30 | |
31 | 31 | /** |
32 | 32 | * constructor |
33 | - * @param string $filepath ファイルパス |
|
33 | + * @param string $filePath ファイルパス |
|
34 | 34 | */ |
35 | 35 | public function __construct(stirng $filePath) |
36 | 36 | { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | while (@is_link($filePath)) { |
85 | 85 | $linkPath = readlink($filePath); |
86 | 86 | if ($linkPath === false) { |
87 | - throw new IOException("Symbolic link read error: " . $filePath); |
|
87 | + throw new IOException("Symbolic link read error: ".$filePath); |
|
88 | 88 | } |
89 | 89 | $filePath = $linkPath; |
90 | 90 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $length = filesize($filePath); |
180 | 180 | |
181 | 181 | if ($length === false) { |
182 | - throw new IOException("Cannot get filesize of " . $filePath); |
|
182 | + throw new IOException("Cannot get filesize of ".$filePath); |
|
183 | 183 | } |
184 | 184 | } |
185 | 185 | |
@@ -229,10 +229,10 @@ discard block |
||
229 | 229 | $dirname = dirname($destPath); |
230 | 230 | $dir = new File($dirname); |
231 | 231 | if (!$dir->isWritable()) { |
232 | - throw new IOException("Cannot writable: " . $destPath); |
|
232 | + throw new IOException("Cannot writable: ".$destPath); |
|
233 | 233 | } |
234 | 234 | $dirPath = $dir->getFilePath(); |
235 | - $absDestPath = $dirPath . "/" . basename($destPath); |
|
235 | + $absDestPath = $dirPath."/".basename($destPath); |
|
236 | 236 | |
237 | 237 | return rename($this->filePath, $absDestPath); |
238 | 238 | } |
@@ -30,11 +30,11 @@ discard block |
||
30 | 30 | } else if (is_string($file)) { |
31 | 31 | $this->file = new File($file); |
32 | 32 | } else { |
33 | - throw new InvalidArgumentException("Unable to open file: " . $file); |
|
33 | + throw new InvalidArgumentException("Unable to open file: ".$file); |
|
34 | 34 | } |
35 | 35 | $stream = @fopen($this->file->getAbsoluteFilePath(), 'r'); |
36 | 36 | if (!is_resource($stream) || $stream === false) { |
37 | - throw new IOException("Unable open " . $this->file->getAbsoluteFilePath()); |
|
37 | + throw new IOException("Unable open ".$this->file->getAbsoluteFilePath()); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | parent::__construct($stream); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | public function reset() |
134 | 134 | { |
135 | 135 | if (!$this->isMarkSupported()) { |
136 | - throw new IOException(get_class($this) . " does not support mark and reset."); |
|
136 | + throw new IOException(get_class($this)." does not support mark and reset."); |
|
137 | 137 | } |
138 | 138 | |
139 | 139 | // ポインタ位置をmark位置に移動 |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | public function mark() |
84 | 84 | { |
85 | 85 | if (!$this->isMarkSupported()) { |
86 | - throw new IOException(get_class($this) . " does not support mark."); |
|
86 | + throw new IOException(get_class($this)." does not support mark."); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | $this->markedPosition = $this->cursorPosition; |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | public function reset() |
97 | 97 | { |
98 | 98 | if (!$this->isMarkSupported()) { |
99 | - throw new IOException(get_class($this) . " does not support mark and reset."); |
|
99 | + throw new IOException(get_class($this)." does not support mark and reset."); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | // mark位置を初期値に戻す |
@@ -2,7 +2,6 @@ |
||
2 | 2 | namespace WebStream\IO; |
3 | 3 | |
4 | 4 | use WebStream\Exception\Extend\InvalidArgumentException; |
5 | -use WebStream\Exception\Extend\IOException; |
|
6 | 5 | |
7 | 6 | /** |
8 | 7 | * StringInputStream |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $dirname = dirname($filepath); |
39 | 39 | $dir = new File($dirname); |
40 | 40 | if (!$dir->isWritable()) { |
41 | - throw new IOException("Cannot writable: " . $filepath); |
|
41 | + throw new IOException("Cannot writable: ".$filepath); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | $this->filepath = $filepath; |
@@ -60,11 +60,11 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | if (!is_resource($stream) || $stream === false) { |
63 | - throw new IOException("Unable open " . $this->filepath); |
|
63 | + throw new IOException("Unable open ".$this->filepath); |
|
64 | 64 | } |
65 | 65 | |
66 | - if (!flock($stream, LOCK_EX | LOCK_NB)) { |
|
67 | - throw new IOException("Cannot lock file: " . $this->filepath); |
|
66 | + if (!flock($stream, LOCK_EX|LOCK_NB)) { |
|
67 | + throw new IOException("Cannot lock file: ".$this->filepath); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | if (fwrite($stream, $data) === false) { |
@@ -29,8 +29,8 @@ |
||
29 | 29 | public function __initialize(Container $container); |
30 | 30 | |
31 | 31 | /** |
32 | - * カスタムアノテーション情報を設定する |
|
33 | - * @param array<mixed> カスタムアノテーション情報 |
|
32 | + * カスタムアノテーション情報を設定する |
|
33 | + * @param array<mixed> カスタムアノテーション情報 |
|
34 | 34 | */ |
35 | 35 | public function __customAnnotation(array $annotation); |
36 | 36 | } |