webstream-framework / WebStream

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 +26 added lines, -26 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,20 +179,20 @@ 
      */
     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;
         $factory = new CacheDriverFactory();
         $config = new Container(false);
         $config->cacheDir = $cacheDir;
         $config->classPrefix = "view_cache";
         $cache = $factory->create("WebStream\Cache\Driver\TemporaryFile", $config);
         $cache->inject('logger', $this->logger);
-        var_dump($cacheDir . "/" . $filename . ".cache");
-        $file = new File($cacheDir . "/" . $filename . ".cache");
+        var_dump($cacheDir."/".$filename.".cache");
+        $file = new File($cacheDir."/".$filename.".cache");
         if (!$file->exists() || $this->timestamp > $file->lastModified()) {
             if ($cache->add($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());
             }
         }
     }
@@ -219,29 +219,29 @@ 
     {
         $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_callback('/' . self::TEMPLATE_MARK_TEMPLATE . '\{(.*?)\}/', function ($matches) {
+        $content = preg_replace('/'.self::TEMPLATE_MARK_PHP.'\{(.*?)\}/', '<?php echo $1; ?>', $content);
+        $content = preg_replace_callback('/'.self::TEMPLATE_MARK_TEMPLATE.'\{(.*?)\}/', function($matches) {
             if (substr($matches[1], 0, 1) === '$') {
-                return self::TEMPLATE_MARK_TEMPLATE . '{<?php echo ' . $matches[1] . ';?>}';
+                return self::TEMPLATE_MARK_TEMPLATE.'{<?php echo '.$matches[1].';?>}';
             } else {
-                return '<?php $this->draw(\'' . $matches[1] . '\', $__params__, $__mimeType__); ?>';
+                return '<?php $this->draw(\''.$matches[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/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/Database/Driver/Sqlite.php

Spacing +1 added lines, -1 removed lines

@@ -31,6 +31,6 @@
         ]);
 
         $this->connection = DriverManager::getConnection($params, $config);
-        $this->logger->debug(get_class($this) . " connect.");
+        $this->logger->debug(get_class($this)." connect.");
     }
 }

WebStream/Delegate/AnnotationDelegatorFactory.php

Spacing +10 added lines, -10 removed lines

@@ -103,7 +103,7 @@ 
             unset($injectedAnnotation[$annotationKey]);
         }
 
-        return function () use ($injectedAnnotation) {
+        return function() use ($injectedAnnotation) {
             return $injectedAnnotation;
         };
     }
@@ -115,7 +115,7 @@ 
      */
     private function createHeader($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $headerContainer = new Container();
             $headerContainer->mimeType = "html";
             if ($containerList !== null) {
@@ -133,7 +133,7 @@ 
      */
     private function createFilter($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $filterListContainer = new Container();
             $filterListContainer->initialize = new AnnotationListContainer();
             $filterListContainer->before     = new AnnotationListContainer();
@@ -145,7 +145,7 @@ 
                 // アクションメソッドの@Filter(type="skip")をチェックする
                 // 1メソッドに対して複数の@Filterが指定されてもエラーにはしない
                 foreach ($containerList as $filterAnnotation) {
-                    if ($filterAnnotation->classpath . "#" . $filterAnnotation->action === $filterAnnotation->method->class . "#" . $filterAnnotation->method->name) {
+                    if ($filterAnnotation->classpath."#".$filterAnnotation->action === $filterAnnotation->method->class."#".$filterAnnotation->method->name) {
                         if ($filterAnnotation->annotation->type === 'skip') {
                             $exceptMethods = $filterAnnotation->annotation->except;
                             if (!is_array($exceptMethods)) {
@@ -217,7 +217,7 @@ 
      */
     private function createTemplate($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $templateContainer = new Container(false);
             $templateContainer->engine = $containerList !== null ? $containerList[0]->engine : null;
             $templateContainer->cacheTime = $containerList !== null ? $containerList[0]->cacheTime : null;
@@ -233,7 +233,7 @@ 
      */
     private function createExceptionHandler($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList === null ? [] : $containerList;
         };
     }
@@ -245,7 +245,7 @@ 
      */
     private function createDatabase($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList;
         };
     }
@@ -257,7 +257,7 @@ 
      */
     private function createQuery($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList;
         };
     }
@@ -269,8 +269,8 @@ 
      */
     private function createAlias($containerList)
     {
-        return function () use ($containerList) {
-            return $containerList === null ? [] : $containerList;;
+        return function() use ($containerList) {
+            return $containerList === null ? [] : $containerList; ;
         };
     }
 }

Doc Comments +11 added lines, -10 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * Constructor
      * @param array<string> 注入後の返却情報
-     * @param Container 依存コンテナ
+     * @param Container Container
      */
     public function __construct(array $injectedAnnotation, Container $container)
     {
@@ -56,7 +56,8 @@ 
     /**
      * CustomAnnotation結果を返却する
      * @param  string アノテーションID
-     * @return Callable CustomAnnotation結果
+     * @param string $annotationId
+     * @return \Closure CustomAnnotation結果
      */
     public function createAnnotationCallable($annotationId)
     {
@@ -95,7 +96,7 @@ 
 
     /**
      * CustomAnnotation結果を返却する
-     * @return Callable CustomAnnotation結果
+     * @return \Closure CustomAnnotation結果
      */
     public function createCustomAnnotationCallable()
     {
@@ -112,7 +113,7 @@ 
     /**
      * Header結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Header結果
+     * @return \Closure Header結果
      */
     private function createHeader($containerList)
     {
@@ -130,7 +131,7 @@ 
     /**
      * Filter結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Filter結果
+     * @return \Closure Filter結果
      */
     private function createFilter($containerList)
     {
@@ -214,7 +215,7 @@ 
     /**
      * Template結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Template結果
+     * @return \Closure Template結果
      */
     private function createTemplate($containerList)
     {
@@ -230,7 +231,7 @@ 
     /**
      * ExceptionHandler結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable ExceptionHandler結果
+     * @return \Closure ExceptionHandler結果
      */
     private function createExceptionHandler($containerList)
     {
@@ -242,7 +243,7 @@ 
     /**
      * Database結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Database結果
+     * @return \Closure Database結果
      */
     private function createDatabase($containerList)
     {
@@ -254,7 +255,7 @@ 
     /**
      * Query結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Query結果
+     * @return \Closure Query結果
      */
     private function createQuery($containerList)
     {
@@ -266,7 +267,7 @@ 
     /**
      * Alias結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Alias結果
+     * @return \Closure Alias結果
      */
     private function createAlias($containerList)
     {

WebStream/Delegate/ExceptionDelegator.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
                         // そうでなければ複数回メソッドが実行されるため
                         // ただし同一クラス内に限る(親クラスの同一名のメソッドは実行する)
                         // TODO ここはテストを追加する
-                        $classpath = $refMethod->class . "#" . $refMethod->name;
+                        $classpath = $refMethod->class."#".$refMethod->name;
                         if (!array_key_exists($classpath, $invokeMethods)) {
                             $invokeMethods[$classpath] = $refMethod;
                         }
@@ -100,7 +100,7 @@ 
             foreach ($invokeMethods as $classpath => $invokeMethod) {
                 $params = ["class" => get_class($this->instance), "method" => $this->method, "exception" => $originException];
                 $invokeMethod->invokeArgs($this->instance, [$params]);
-                $this->logger->debug("Execution of handling is success: " . $classpath);
+                $this->logger->debug("Execution of handling is success: ".$classpath);
             }
 
             throw $delegateException ?: $originException;

WebStream/Delegate/CoreExceptionDelegator.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         if (class_exists($this->classpath)) {
             throw new $this->classpath($this->message);
         } else {
-            throw new ClassNotFoundException($this->classpath . " is not found.");
+            throw new ClassNotFoundException($this->classpath." is not found.");
         }
     }
 }

WebStream/Template/Twig.php

Spacing +3 added lines, -3 removed lines

@@ -41,8 +41,8 @@ 
     {
         $applicationInfo = $this->container->applicationInfo;
         $dirname = $this->camel2snake($this->container->router->pageName);
-        $templateDir = $applicationInfo->applicationRoot . "/app/views/" . $dirname;
-        $sharedDir = $applicationInfo->applicationRoot . "/app/views/" . $applicationInfo->sharedDir;
+        $templateDir = $applicationInfo->applicationRoot."/app/views/".$dirname;
+        $sharedDir = $applicationInfo->applicationRoot."/app/views/".$applicationInfo->sharedDir;
 
         if (is_dir($templateDir)) {
             $this->loader->addPath($templateDir);
@@ -53,7 +53,7 @@ 
 
         $escaper = new \Twig_Extension_Escaper(true);
         $twig = new \Twig_Environment($this->loader, [
-            'cache' => $applicationInfo->applicationRoot . "/app/views/" . $applicationInfo->cacheDir,
+            'cache' => $applicationInfo->applicationRoot."/app/views/".$applicationInfo->cacheDir,
             'auto_reload' => true,
             'debug' => $this->container->debug
         ]);