webstream-framework / WebStream

WebStream/Cache/Driver/TemporaryFile.php

Spacing +15 added lines, -15 removed lines

@@ -33,7 +33,7 @@ 
     public function __construct(Container $cacheContainer)
     {
         $this->cacheContainer = $cacheContainer;
-        $this->cachePrefix = $this->cacheContainer->cachePrefix . '.' . $this->cacheContainer->classPrefix . '.';
+        $this->cachePrefix = $this->cacheContainer->cachePrefix.'.'.$this->cacheContainer->classPrefix.'.';
     }
 
     /**
@@ -44,7 +44,7 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $writer = null;
         $isAppend = !$overwrite;
 
@@ -55,10 +55,10 @@ 
         ]);
 
         try {
-            $file = new File($this->cacheContainer->cacheDir . '/' . $key . '.cache');
+            $file = new File($this->cacheContainer->cacheDir.'/'.$key.'.cache');
             $writer = $this->cacheContainer->ioContainer->fileWriter->getWriter($file, $isAppend);
             $writer->write($value);
-            $this->logger->info("Execute cache save: " . $key);
+            $this->logger->info("Execute cache save: ".$key);
             return true;
         } catch (IOException $e) {
             $this->logger->warn($e->getMessage());
@@ -82,10 +82,10 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return null;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $value = null;
         $reader = null;
-        $file = new File($this->cacheContainer->cacheDir . '/' . $key . '.cache');
+        $file = new File($this->cacheContainer->cacheDir.'/'.$key.'.cache');
 
         if ($file->isReadable()) {
             try {
@@ -93,12 +93,12 @@ 
                 $data = $this->decode($reader->read());
                 if ($data['ttl'] > 0) {
                     if (time() > $data['time'] + $data['ttl']) {
-                        $this->logger->info("Expired cache: " . $key);
+                        $this->logger->info("Expired cache: ".$key);
                         $file->delete();
                     }
                 } else {
                     $value = $data['data'];
-                    $this->logger->info("Execute cache read: " . $key);
+                    $this->logger->info("Execute cache read: ".$key);
                 }
             } catch (IOException $e) {
                 $this->logger->warn($e->getMessage());
@@ -124,15 +124,15 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $result = false;
 
-        $file = new File($this->cacheContainer->cacheDir . '/' . $key . '.cache');
+        $file = new File($this->cacheContainer->cacheDir.'/'.$key.'.cache');
         if ($file->isWritable()) {
             $result = $file->delete();
-            $this->logger->info("Execute cache cleared: " . $key);
+            $this->logger->info("Execute cache cleared: ".$key);
         } else {
-            $this->logger->warn("Failed to clear cache: " . $key);
+            $this->logger->warn("Failed to clear cache: ".$key);
         }
 
         return $result;
@@ -157,9 +157,9 @@ 
                         $file = new File($filepath);
                         if ($file->isWritable()) {
                             if ($file->delete()) {
-                                $this->logger->info("Execute cache cleared: " . $this->cachePrefix . "*");
+                                $this->logger->info("Execute cache cleared: ".$this->cachePrefix."*");
                             } else {
-                                $this->logger->warn("Failed to clear cache: " . $this->cachePrefix . "*");
+                                $this->logger->warn("Failed to clear cache: ".$this->cachePrefix."*");
                                 $result = false;
                             }
                         } else {
@@ -172,7 +172,7 @@ 
                 }
             }
         } else {
-            $this->logger->warn("Can't read directory:" . $dir->getFilePath());
+            $this->logger->warn("Can't read directory:".$dir->getFilePath());
             $result = false;
         }
 

WebStream/Template/Basic.php

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/Delegate/CoreExecuteDelegator.php

Spacing +3 added lines, -3 removed lines

@@ -181,11 +181,11 @@ 
 
         // テンプレートキャッシュチェック
         $pageName = $this->container->coreDelegator->getPageName();
-        $cacheFile = $applicationInfo->cachePrefix . $this->camel2snake($pageName) . "-" . $this->camel2snake($method);
+        $cacheFile = $applicationInfo->cachePrefix.$this->camel2snake($pageName)."-".$this->camel2snake($method);
 
         $factory = new CacheDriverFactory();
         $config = new Container(false);
-        $config->cacheDir = $applicationInfo->applicationRoot . "/app/views/" . $applicationInfo->cacheDir;
+        $config->cacheDir = $applicationInfo->applicationRoot."/app/views/".$applicationInfo->cacheDir;
         $config->classPrefix = "view_cache";
         $cache = $factory->create("WebStream\Cache\Driver\TemporaryFile", $config);
         $cache->inject('logger', $this->logger);
@@ -254,7 +254,7 @@ 
             ]);
 
             if ($template->cacheTime !== null) {
-                $cacheFile = $applicationInfo->cachePrefix . $this->camel2snake($pageName) . "-" . $this->camel2snake($method);
+                $cacheFile = $applicationInfo->cachePrefix.$this->camel2snake($pageName)."-".$this->camel2snake($method);
                 $view->templateCache($cacheFile, ob_get_contents(), $template->cacheTime);
             }