webstream-framework / WebStream

WebStream/DI/Injector.php

Doc Comments +1 added lines

@@ -17,6 +17,7 @@
      * オブジェクトを注入する
      * @param string プロパティ名
      * @param mixed オブジェクト
+     * @param string $name
      * @return Injector
      */
     public function inject($name, $object)

WebStream/Exception/SystemException.php

Doc Comments +1 added lines

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

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

WebStream/Http/Request.php

Doc Comments +1 added lines

@@ -108,6 +108,7 @@
     /**
      * SERVERパラメータ取得
      * @param string パラメータキー
+     * @param string $key
      */
     private function server($key)
     {

WebStream/Http/Response.php

Doc Comments +9 added lines

@@ -67,6 +67,7 @@ 
     /**
      * Cache-Controlを設定
      * @param String Cache-Control
+     * @param string $cacheControl
      */
     public function setCacheControl($cacheControl)
     {
@@ -76,6 +77,7 @@ 
     /**
      * Pragmaを設定
      * @param String Pragma
+     * @param string $pragma
      */
     public function setPragma($pragma)
     {
@@ -86,6 +88,7 @@ 
      * MimeTypeを設定
      * ファイルタイプにより指定
      * @param String ファイルタイプ
+     * @param string $fileType
      */
     public function setType($fileType)
     {
@@ -167,6 +170,7 @@ 
     /**
      * Content-Lengthを設定
      * @param Integer Content-Length
+     * @param integer $contentLength
      */
     public function setContentLength($contentLength)
     {
@@ -187,6 +191,7 @@ 
     /**
      * Content-Transfer-Encodingを設定
      * @param String エンコーディング方法
+     * @param string $contentTransferEncoding
      */
     public function setContentTransferEncoding($contentTransferEncoding)
     {
@@ -196,6 +201,7 @@ 
     /**
      * Expiresを設定
      * @param Integer 有効期限
+     * @param integer $expires
      */
     public function setExpires($expires)
     {
@@ -205,6 +211,7 @@ 
     /**
      * レスポンスボディを設定
      * @param String レスポンスボディ
+     * @param string $body
      */
     public function setBody($body)
     {
@@ -504,6 +511,7 @@ 
     /**
      * 指定したステータスコードのページに遷移
      * @param Integer ステータスコード
+     * @param integer $statusCode
      */
     public function move($statusCode)
     {
@@ -545,6 +553,7 @@ 
     /**
      * HTMLテンプレート
      * @param String 表示内容
+     * @param string $content
      * @return String HTML
      */
     private function bodyTemplate($content)

Indentation +1 added lines, -1 removed lines

@@ -236,7 +236,7 @@
     {
         // StatusCode
         $headerMessage = 'HTTP/' . self::HTTP_VERSION . ' ' .
-                         $this->statusCode . ' ' . $this->status[$this->statusCode];
+                            $this->statusCode . ' ' . $this->status[$this->statusCode];
         header($headerMessage);
 
         // Redirect

Spacing +18 added lines, -18 removed lines

@@ -155,11 +155,11 @@ 
     public function setStatusCode($statusCode)
     {
         if (!is_string($statusCode) && !is_int($statusCode)) {
-            throw new ConnectionException("Invalid status code format: " . strval($statusCode));
+            throw new ConnectionException("Invalid status code format: ".strval($statusCode));
         }
 
         if (!array_key_exists($statusCode, $this->status)) {
-            throw new ConnectionException("Unknown status code: " . $statusCode);
+            throw new ConnectionException("Unknown status code: ".$statusCode);
         }
         $this->statusCode = $statusCode;
     }
@@ -180,7 +180,7 @@ 
     public function setContentDisposition($filename)
     {
         if (file_exists($filename)) {
-            $this->contentDisposition = 'attachement; filename="'. basename($filename) . '"';
+            $this->contentDisposition = 'attachement; filename="'.basename($filename).'"';
         }
     }
 
@@ -235,43 +235,43 @@ 
     public function header()
     {
         // StatusCode
-        $headerMessage = 'HTTP/' . self::HTTP_VERSION . ' ' .
-                         $this->statusCode . ' ' . $this->status[$this->statusCode];
+        $headerMessage = 'HTTP/'.self::HTTP_VERSION.' '.
+                         $this->statusCode.' '.$this->status[$this->statusCode];
         header($headerMessage);
 
         // Redirect
         if (intval($this->statusCode) === 301) {
-            header('Location: ' . $this->location);
+            header('Location: '.$this->location);
         }
 
         // Content-Type
-        header('Content-Type: ' . $this->mimeType . '; charset=' . $this->charset);
+        header('Content-Type: '.$this->mimeType.'; charset='.$this->charset);
 
         // Content-Length
         if ($this->contentLength === null) {
             $this->contentLength = $this->bytelen($this->body);
         }
-        header('Content-Length: ' . $this->contentLength);
+        header('Content-Length: '.$this->contentLength);
 
         // Content-Disposition
         if ($this->contentDisposition !== null) {
-            header('Content-Disposition: ' . $this->contentDisposition);
+            header('Content-Disposition: '.$this->contentDisposition);
         }
 
         // Content-Transfer-Encoding
         if ($this->contentTransferEncoding !== null) {
-            header('Content-Transfer-Encoding: ' . $this->contentTransferEncoding);
+            header('Content-Transfer-Encoding: '.$this->contentTransferEncoding);
         }
 
         // Cache-Control
-        header('Cache-Control: ' . $this->cacheControl);
+        header('Cache-Control: '.$this->cacheControl);
 
         // Pragma
-        header('Pragma: ' . $this->pragma);
+        header('Pragma: '.$this->pragma);
 
         // Expires
         if ($this->expires !== null) {
-            header('Expires: ' . $this->expires);
+            header('Expires: '.$this->expires);
         }
 
         // X-Content-Type-Options
@@ -279,20 +279,20 @@ 
 
         // Access-Control-Allow-Origin
         if (!empty($this->accessControlAllowOrigin)) {
-            header('Access-Control-Allow-Origin: ' . implode(',', $this->accessControlAllowOrigin));
+            header('Access-Control-Allow-Origin: '.implode(',', $this->accessControlAllowOrigin));
         }
 
         // X-Frame-Options
         if ($this->xframeOptions !== null) {
-            header('X-Frame-Options: ' . $this->xframeOptions);
+            header('X-Frame-Options: '.$this->xframeOptions);
         }
 
         // X-XSS-Protection
         if ($this->xxssProtection !== null) {
-            header('X-XSS-Protection: ' . $this->xxssProtection);
+            header('X-XSS-Protection: '.$this->xxssProtection);
         }
 
-        $this->logger->info("HTTP access occured: status code " . $this->statusCode);
+        $this->logger->info("HTTP access occured: status code ".$this->statusCode);
     }
 
     /**
@@ -510,7 +510,7 @@ 
         ob_clean(); // これまでの出力バッファをクリア
         $statusCode = array_key_exists($statusCode, $this->status) ? $statusCode : 500;
         $this->setStatusCode($statusCode);
-        $bodyMessage = $statusCode . ' ' . $this->status[$statusCode];
+        $bodyMessage = $statusCode.' '.$this->status[$statusCode];
         $this->setBody($this->bodyTemplate($bodyMessage));
         $this->send();
         exit;

WebStream/Http/Session.php

Doc Comments +4 added lines

@@ -49,6 +49,10 @@
      * @param string Cookieを有効にするドメイン
      * @param boolean Secure属性を有効にする
      * @param boolean HttpOnly属性を有効にする
+     * @param string $path
+     * @param string $domain
+     * @param boolean $secure
+     * @param boolean $httpOnly
      */
     private function initialize($expire, $path, $domain, $secure, $httpOnly)
     {

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 +16 added lines, -16 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;
                 }
             }
@@ -114,13 +114,13 @@ 
         }
 
         // 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)) {
@@ -133,12 +133,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)) {
@@ -146,12 +146,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/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 +25 added lines, -25 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->length());
+        $this->logger->debug("Write temporary template file: ".$tmpFile->getFilePath());
+        $this->logger->debug("Compiled template file size: ".$tmpFile->length());
 
         $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->length());
+        $this->logger->debug("Write temporary template file: ".$tmpFile->getFilePath());
+        $this->logger->debug("Compiled template file size: ".$tmpFile->length());
 
         $params["__params__"] = $params;
         $params["__mimeType__"] = $mimeType;
@@ -179,7 +179,7 @@ 
      */
     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;
@@ -187,12 +187,12 @@ 
         $cache = $factory->create("WebStream\Cache\Driver\TemporaryFile", $config);
         $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->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);