webstream-framework / WebStream

WebStream/Module/ClassLoader.php

Doc Comments +2 added lines

@@ -27,6 +27,7 @@ 
     /**
      * クラスをロードする
      * @param string|array クラス名
+     * @param string $className
      * @return array<string> ロード済みクラスリスト
      */
     public function load($className)
@@ -38,6 +39,7 @@ 
      * ファイルをインポートする
      * @param string ファイルパス
      * @param callable フィルタリング無名関数 trueを返すとインポート
+     * @param string $filepath
      * @return boolean インポート結果
      */
     public function import($filepath, callable $filter = null)

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/Module/Container.php

Doc Comments -2 removed lines

@@ -72,8 +72,6 @@
 
     /**
      * キーの値を設定する
-     * @param  string $name      メソッド名
-     * @param  array  $arguments 引数リスト
      * @return void
      */
     public function set($key, $value)

WebStream/Module/Functions.php

Unused Use Statements -1 removed lines

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

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Functions
- * @author Ryuichi TANAKA.
- * @since 2013/09/04
- * @version 0.7
- */
+     * Functions
+     * @author Ryuichi TANAKA.
+     * @since 2013/09/04
+     * @version 0.7
+     */
 
 use WebStream\Module\Security;
 use WebStream\DI\ServiceLocator;

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
     {
         // ログ処理
         if ($error = error_get_last()) {
-            $errorMsg = $error['message'] . " " . $error['file'] . "(" . $error['line'] . ")";
+            $errorMsg = $error['message']." ".$error['file']."(".$error['line'].")";
             switch ($error['type']) {
                 case E_ERROR:
                 case E_CORE_ERROR:
@@ -92,7 +92,7 @@ 
 if (!function_exists('safetyOutJSON')) {
     function safetyOutJSON($data)
     {
-        return json_encode($data, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT);
+        return json_encode($data, JSON_HEX_TAG|JSON_HEX_AMP|JSON_HEX_APOS|JSON_HEX_QUOT);
     }
 }
 
@@ -102,6 +102,6 @@ 
 if (!function_exists('safetyOutJSONP')) {
     function safetyOutJSONP($data, $callback)
     {
-        return safetyOutJavaScript($callback) . "(" . safetyOutJSON($data) . ");";
+        return safetyOutJavaScript($callback)."(".safetyOutJSON($data).");";
     }
 }

WebStream/Module/HttpClient.php

Doc Comments +3 added lines

@@ -166,6 +166,7 @@ 
      * @param array リクエストヘッダ
      * @param array<string> リクエストパラメータ
      * @param string 実行するRESTメソッド
+     * @param string $method
      * @return string レスポンス
      */
     private function http($url, $headers, $params, $method)
@@ -250,6 +251,8 @@ 
      * @param array<string> オプション配列
      * @param string 配列キー
      * @param string or Integer デフォルト値
+     * @param string $key
+     * @param integer $default_value
      * @return mixed オプション配列の値
      */
     private function getOptionParameter($options, $key, $default_value = null)

Spacing +7 added lines, -7 removed lines

@@ -146,7 +146,7 @@ 
         $host = $this->proxy_host;
         $host = preg_replace('/^http(:\/\/.+)$/', 'tcp${1}', $host);
         $host = preg_replace('/^https(:\/\/.+)$/', 'ssl${1}', $host);
-        $request["proxy"] = $host . ":" . strval($this->proxy_port);
+        $request["proxy"] = $host.":".strval($this->proxy_port);
         $request["request_fulluri"] = true;
     }
 
@@ -156,8 +156,8 @@ 
      */
     private function basicAuth(&$headers)
     {
-        $headers[] = "Authorization: Basic " .
-            base64_encode($this->basic_auth_id . ":" . $this->basic_auth_password);
+        $headers[] = "Authorization: Basic ".
+            base64_encode($this->basic_auth_id.":".$this->basic_auth_password);
     }
 
     /**
@@ -175,14 +175,14 @@ 
             // GETの場合はstream_context_createでクエリを渡しても有効にならないため
             // URLにクエリストリングを付けることで対処
             if ($method === "GET") {
-                $url .= "?" . $params;
+                $url .= "?".$params;
             }
         }
         if (empty($headers) && ($method === "POST" || $method === "PUT")) {
             $contentLength = !is_string($params) ? 0 : strlen($params);
             $headers = [
                 "Content-Type: application/x-www-form-urlencoded",
-                "Content-Length: " . $contentLength
+                "Content-Length: ".$contentLength
             ];
         }
         $request = [
@@ -208,10 +208,10 @@ 
             $hasHeader = @get_headers($url);
             if ($hasHeader === false) { // ヘッダを持たない場合、存在しないURL
                 $this->status_code = 404;
-                $this->logger->error("URL not found: " . $url);
+                $this->logger->error("URL not found: ".$url);
             } else { // ヘッダを持つ場合はタイムアウトが発生
                 $this->status_code = 408;
-                $this->logger->error("Request timeout: " . $url);
+                $this->logger->error("Request timeout: ".$url);
             }
 
             return null;

WebStream/Module/Utility/ApplicationUtils.php

Doc Comments +1 added lines

@@ -108,6 +108,7 @@
      * CoreHelper#asyncで使用するコードを返却する
      * @param string URL
      * @param string CSSクラス名
+     * @param string $url
      * @return string コード
      */
     public function asyncHelperCode($url, $id)

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
         $isProjectRoot = false;
 
         while (!$isProjectRoot) {
-            if (file_exists($targetPath . DIRECTORY_SEPARATOR . $this->getProjectFileName())) {
+            if (file_exists($targetPath.DIRECTORY_SEPARATOR.$this->getProjectFileName())) {
                 $isProjectRoot = true;
             } else {
                 if (preg_match("/(.*)\//", $targetPath, $matches)) {
@@ -56,7 +56,7 @@ 
                 if (preg_match("/^namespace\s(.*);$/", $line, $matches)) {
                     $namespace = $matches[1];
                     if (substr($namespace, 0) !== '\\') {
-                        $namespace = '\\' . $namespace;
+                        $namespace = '\\'.$namespace;
                     }
 
                     return $namespace;

WebStream/Template/Basic.php

Doc Comments +3 added lines

@@ -195,6 +195,7 @@ 
      * テンプレートを描画する
      * @param string テンプレートファイル
      * @param mixed 展開するパラメータ
+     * @param string $template
      */
     private function outputHTML($template, $params)
     {
@@ -207,6 +208,7 @@ 
      * テンプレート記法を変換する
      * @param string 変換前出力内容
      * @param string mimeType
+     * @param string $content
      * @return bool 変換されたらtrue
      */
     private function replaceTemplateMark(&$content, $mimeType)
@@ -245,6 +247,7 @@ 
     /**
      * すべてのformタグにCSRF対策トークンを追加する
      * @param string HTML文字列の参照
+     * @param string $csrfToken
      */
     private function addToken(&$content, $csrfToken)
     {

Indentation +4 added lines, -4 removed lines

@@ -284,10 +284,10 @@
         }
         // 実体参照化をもとに戻す。
         $map = array('>' => '>',
-                     '&lt;' => '<',
-                     '%20'  => ' ',
-                     '%24'  => '$',
-                     '%5C'  => '\\');
+                        '&lt;' => '<',
+                        '%20'  => ' ',
+                        '%24'  => '$',
+                        '%5C'  => '\\');
 
         // HTMLタグを補完する
         $content = <<< HTML

Spacing +23 added lines, -23 removed lines

@@ -58,7 +58,7 @@ 
     public function __construct(Container $container)
     {
         $this->container = $container;
-        $this->session  = $container->session;
+        $this->session = $container->session;
         $this->timestamp = 0;
         $this->logger = $container->logger;
     }
@@ -72,12 +72,12 @@ 
         $params = ["model" => $params["model"], "helper" => $params["helper"]];
         $dirname = $this->camel2snake($this->container->router->pageName);
 
-        $templateFile = new File($this->container->applicationInfo->applicationRoot . "/app/views/" . $dirname . "/" . $this->container->filename);
-        $sharedFile = new File($this->container->applicationInfo->applicationRoot . "/app/views/" . $this->container->applicationInfo->sharedDir . "/" . $this->container->filename);
+        $templateFile = new File($this->container->applicationInfo->applicationRoot."/app/views/".$dirname."/".$this->container->filename);
+        $sharedFile = new File($this->container->applicationInfo->applicationRoot."/app/views/".$this->container->applicationInfo->sharedDir."/".$this->container->filename);
 
         $file = $templateFile->exists() ? $templateFile : ($sharedFile->exists() ? $sharedFile : null);
         if ($file === null) {
-            $errorMessage = "Invalid template file path: " . $templateFile->getFilePath() . " or " .  $sharedFile->getFilePath();
+            $errorMessage = "Invalid template file path: ".$templateFile->getFilePath()." or ".$sharedFile->getFilePath();
             throw new ResourceNotFoundException($errorMessage);
         }
 
@@ -93,12 +93,12 @@ 
         $this->replaceTemplateMark($content, $mimeType);
 
         // テンプレートファイルをコンパイルし一時ファイルを作成
-        $tmpFile = new File($this->getTemporaryDirectory() . "/" . $this->getRandomstring(30));
+        $tmpFile = new File($this->getTemporaryDirectory()."/".$this->getRandomstring(30));
         $writer = new FileWriter($tmpFile);
         $writer->write($content);
         $writer->close();
-        $this->logger->debug("Write temporary template file: " . $tmpFile->getFilePath());
-        $this->logger->debug("Compiled template file size: " . $tmpFile->size());
+        $this->logger->debug("Write temporary template file: ".$tmpFile->getFilePath());
+        $this->logger->debug("Compiled template file size: ".$tmpFile->size());
 
         $params["__params__"] = $params;
         $params["__mimeType__"] = $mimeType;
@@ -128,18 +128,18 @@ 
         // CSRFチェックが実行される前に非同期でリクエストがあった場合を考慮して
         // CSRFトークンは削除しない
         if (preg_match('/<form.*?>.*?<\/form>/is', $content)) {
-            $csrfToken = sha1($this->session->id() . microtime());
+            $csrfToken = sha1($this->session->id().microtime());
             $this->session->set($this->getCsrfTokenKey(), $csrfToken);
             $this->addToken($content, $csrfToken);
         }
 
         // テンプレートファイルをコンパイルし一時ファイルを作成
-        $tmpFile = new File($this->getTemporaryDirectory() . "/" . $this->getRandomstring(30));
+        $tmpFile = new File($this->getTemporaryDirectory()."/".$this->getRandomstring(30));
         $writer = new FileWriter($tmpFile);
         $writer->write($content);
         $writer->close();
-        $this->logger->debug("Write temporary template file: " . $tmpFile->getFilePath());
-        $this->logger->debug("Compiled template file size: " . $tmpFile->size());
+        $this->logger->debug("Write temporary template file: ".$tmpFile->getFilePath());
+        $this->logger->debug("Compiled template file size: ".$tmpFile->size());
 
         $params["__params__"] = $params;
         $params["__mimeType__"] = $mimeType;
@@ -179,15 +179,15 @@ 
      */
     public function cache($filename, $data, $expire)
     {
-        $cacheDir = $this->container->applicationInfo->applicationRoot . "/app/views/" . $this->container->applicationInfo->cacheDir;
+        $cacheDir = $this->container->applicationInfo->applicationRoot."/app/views/".$this->container->applicationInfo->cacheDir;
         $cache = new Cache($cacheDir);
         $cache->inject('logger', $this->logger);
-        $file = new File($cacheDir . "/" . $filename . ".cache");
+        $file = new File($cacheDir."/".$filename.".cache");
         if (!$file->exists() || $this->timestamp > $file->lastModified()) {
             if ($cache->save($filename, $data, $expire)) {
-                $this->logger->debug("Write template cache file: " . $file->getFilePath());
+                $this->logger->debug("Write template cache file: ".$file->getFilePath());
             } else {
-                throw new IOException("File write failure: " . $file->getFilePath());
+                throw new IOException("File write failure: ".$file->getFilePath());
             }
         }
     }
@@ -214,23 +214,23 @@ 
     {
         $originContentHash = md5($content);
 
-        $content = preg_replace_callback('/(%.{\$' . $this->getHelperVariableName() . '\->async\(.+?\)})/', function ($matches) {
+        $content = preg_replace_callback('/(%.{\$'.$this->getHelperVariableName().'\->async\(.+?\)})/', function($matches) {
             $asyncId = $this->getAsyncDomId();
-            $context = preg_replace_callback('/\$' . $this->getHelperVariableName() . '->async\((.+?)\)/', function ($matches2) use ($asyncId) {
-                return '$' . $this->getHelperVariableName() . '->async(' . $matches2[1] . ',\'' . $asyncId . '\')';
+            $context = preg_replace_callback('/\$'.$this->getHelperVariableName().'->async\((.+?)\)/', function($matches2) use ($asyncId) {
+                return '$'.$this->getHelperVariableName().'->async('.$matches2[1].',\''.$asyncId.'\')';
             }, $matches[1]);
 
             return "<div id='$asyncId'>$context</div>";
         }, $content);
 
-        $content = preg_replace('/' . self::TEMPLATE_MARK_PHP . '\{(.*?)\}/', '<?php echo $1; ?>', $content);
-        $content = preg_replace('/' . self::TEMPLATE_MARK_TEMPLATE . '\{(.*?)\}/', '<?php $this->draw("$1", $__params__, $__mimeType__); ?>', $content);
+        $content = preg_replace('/'.self::TEMPLATE_MARK_PHP.'\{(.*?)\}/', '<?php echo $1; ?>', $content);
+        $content = preg_replace('/'.self::TEMPLATE_MARK_TEMPLATE.'\{(.*?)\}/', '<?php $this->draw("$1", $__params__, $__mimeType__); ?>', $content);
 
         if ($mimeType === "xml") {
-            $content = preg_replace('/' . self::TEMPLATE_MARK_XML . '\{(.*?)\}/', '<?php echo safetyOutXML($1); ?>', $content);
+            $content = preg_replace('/'.self::TEMPLATE_MARK_XML.'\{(.*?)\}/', '<?php echo safetyOutXML($1); ?>', $content);
         } elseif ($mimeType === "html") {
-            $content = preg_replace('/' . self::TEMPLATE_MARK_HTML . '\{(.*?)\}/', '<?php echo safetyOut($1); ?>', $content);
-            $content = preg_replace('/' . self::TEMPLATE_MARK_JAVASCRIPT . '\{(.*?)\}/', '<?php echo safetyOutJavaScript($1); ?>', $content);
+            $content = preg_replace('/'.self::TEMPLATE_MARK_HTML.'\{(.*?)\}/', '<?php echo safetyOut($1); ?>', $content);
+            $content = preg_replace('/'.self::TEMPLATE_MARK_JAVASCRIPT.'\{(.*?)\}/', '<?php echo safetyOutJavaScript($1); ?>', $content);
         }
 
         $replacedContentHash = md5($content);

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

Doc Comments +1 added lines

@@ -13,6 +13,7 @@
 {
     /**
      * constructor
+     * @param \Exception $exception
      */
     public function __construct($message, $code = 500, $exception = null)
     {

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