webstream-framework / WebStream

WebStream/Annotation/Validate.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,6 @@ 
 <?php
 namespace WebStream\Annotation;
 
-use WebStream\Core\CoreInterface;
 use WebStream\Annotation\Base\Annotation;
 use WebStream\Annotation\Base\IAnnotatable;
 use WebStream\Annotation\Base\IMethod;
@@ -10,7 +9,6 @@ 
 use WebStream\Module\Utility\CommonUtils;
 use WebStream\Module\Utility\ApplicationUtils;
 use WebStream\Module\ClassLoader;
-use WebStream\Module\ServiceLocator;
 use WebStream\Exception\Extend\ValidateException;
 use WebStream\Exception\Extend\AnnotationException;
 use WebStream\Exception\Extend\InvalidRequestException;

WebStream/Core/Application.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use WebStream\Exception\ApplicationException;
 use WebStream\Exception\SystemException;
 use WebStream\Exception\DelegateException;
-use WebStream\Module\ServiceLocator;
 
 /**
  * Applicationクラス

WebStream/IO/Writer/OutputStreamWriter.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
     /**
      * 出力ストリームに書き出す
-     * @param mixed $buf 出力データ
+     * @param string $buf 出力データ
      * @throws WebStream\Exception\Extend\IOException
      */
     public function write($buf)

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace WebStream\IO\Writer;
 
 use WebStream\IO\OutputStream;
-use WebStream\Exception\Extend\InvalidArgumentException;
 
 /**
  * OutputStreamWriter

WebStream/IO/Writer/SimpleFileWriter.php

Doc Comments +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     /**
      * ファイルに書き込む
      * ファイルが存在する場合、常に追記モード
-     * @param mixed $data 書き込みデータ
+     * @param string $data 書き込みデータ
      */
     public function write($data)
     {

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 namespace WebStream\IO\Writer;
 
 use WebStream\IO\File;
-use WebStream\IO\FileOutputStream;
 use WebStream\Exception\Extend\IOException;
 
 /**

WebStream/Log/LoggerConfigurationManager.php

Doc Comments +2 added lines, -1 removed lines

@@ -31,7 +31,7 @@ 
 
     /**
      * Constructor
-     * @param mixed $config ログ設定
+     * @param string $config ログ設定
      * @throws LoggerException
      */
     public function __construct($config)
@@ -179,6 +179,7 @@ 
     /**
      * ログローテートサイクルを時間に変換
      * @param string ローテートサイクル
+     * @param string $cycle
      * @return int ローテート時間
      * @throws LoggerException
      */

Spacing +6 added lines, -6 removed lines

@@ -41,20 +41,20 @@ 
         } else {
             $configMap = parse_ini_file($config);
             if ($configMap === null) {
-                throw new LoggerException("Log config file does not exist: " . $config);
+                throw new LoggerException("Log config file does not exist: ".$config);
             }
         }
 
         $this->logContainer = new Container(false);
         $this->ioContainer = new Container();
 
-        $this->ioContainer->file = function () use ($configMap) {
+        $this->ioContainer->file = function() use ($configMap) {
             if (!array_key_exists("path", $configMap)) {
                 throw new LoggerException("Log path must be defined.");
             }
             return new File($configMap["path"]);
         };
-        $this->ioContainer->fileWriter = function () use ($configMap) {
+        $this->ioContainer->fileWriter = function() use ($configMap) {
             return new SimpleFileWriter($configMap["path"]);
         };
 
@@ -112,7 +112,7 @@ 
         }
 
         $this->logContainer->logPath = $file->getFilePath();
-        $this->logContainer->statusPath = preg_replace_callback('/(.*)\..+/', function ($matches) {
+        $this->logContainer->statusPath = preg_replace_callback('/(.*)\..+/', function($matches) {
             return "$matches[1].status";
         }, $this->logContainer->logPath);
 
@@ -142,7 +142,7 @@ 
             $rotateSize = intval($this->configMap["rotate_size"]);
             // ローテートサイズが不正の場合(正の整数以外の値が設定された場合)
             if ($rotateSize <= 0) {
-                throw new LoggerException("Invalid log rotate size: " . $this->configMap["rotate_size"]);
+                throw new LoggerException("Invalid log rotate size: ".$this->configMap["rotate_size"]);
             }
             $this->logContainer->rotateSize = $rotateSize;
         }
@@ -204,7 +204,7 @@ 
             case 'year':
                 return $year_to_h;
             default:
-                throw new LoggerException("Invalid log rotate cycle: " . $cycle);
+                throw new LoggerException("Invalid log rotate cycle: ".$cycle);
         }
     }
 

WebStream/Cache/Driver/Apcu.php

Spacing +15 added lines, -16 removed lines

@@ -30,9 +30,9 @@ 
     public function __construct(Container $cacheContainer)
     {
         $this->cacheContainer = $cacheContainer;
-        $this->cachePrefix = $this->cacheContainer->cachePrefix . '.';
+        $this->cachePrefix = $this->cacheContainer->cachePrefix.'.';
         if (!empty($this->cacheContainer->classPrefix)) {
-            $this->cachePrefix .= $this->cacheContainer->classPrefix . '.';
+            $this->cachePrefix .= $this->cacheContainer->classPrefix.'.';
         }
     }
 
@@ -44,11 +44,10 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
 
-        $result = $overwrite ? $this->cacheContainer->driver->delegate("apcu_store", [$key, $value, $ttl]) :
-            $this->cacheContainer->driver->delegate("apcu_add", [$key, $value, $ttl]);
-        $this->logger->info("Execute cache save: " . $key);
+        $result = $overwrite ? $this->cacheContainer->driver->delegate("apcu_store", [$key, $value, $ttl]) : $this->cacheContainer->driver->delegate("apcu_add", [$key, $value, $ttl]);
+        $this->logger->info("Execute cache save: ".$key);
 
         return $result;
     }
@@ -61,13 +60,13 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return null;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
         $value = $this->cacheContainer->driver->delegate("apcu_fetch", [$key]);
 
         if ($value !== false) {
-            $this->logger->info("Execute cache read: " . $key);
+            $this->logger->info("Execute cache read: ".$key);
         } else {
-            $this->logger->warn("Failed to read cache: " . $key);
+            $this->logger->warn("Failed to read cache: ".$key);
             $value = null;
         }
 
@@ -82,13 +81,13 @@ 
         if (!$this->isAvailableCacheLibrary()) {
             return false;
         }
-        $key = $this->cachePrefix . $key;
+        $key = $this->cachePrefix.$key;
 
         if ($this->cacheContainer->driver->delegate("apcu_delete", [$key])) {
-            $this->logger->info("Execute cache cleared: " . $key);
+            $this->logger->info("Execute cache cleared: ".$key);
             return true;
         } else {
-            $this->logger->warn("Failed to clear cache: " . $key);
+            $this->logger->warn("Failed to clear cache: ".$key);
             return false;
         }
     }
@@ -103,17 +102,17 @@ 
         }
 
         if (class_exists('\APCUIterator')) {
-            $obj = new \APCUIterator('/^' . $this->cachePrefix . '/', APC_ITER_KEY);
+            $obj = new \APCUIterator('/^'.$this->cachePrefix.'/', APC_ITER_KEY);
             if ($this->cacheContainer->driver->delegate("apcu_delete", [$obj])) {
-                $this->logger->info("Execute all cache cleared: " . $this->cachePrefix . "*");
+                $this->logger->info("Execute all cache cleared: ".$this->cachePrefix."*");
                 return true;
             }
         } elseif ($this->cacheContainer->driver->delegate("apcu_clear_cache")) {
-            $this->logger->info("Execute all cache cleared: " . $this->cachePrefix . "*");
+            $this->logger->info("Execute all cache cleared: ".$this->cachePrefix."*");
             return true;
         }
 
-        $this->logger->warn("Failed to clear all cache: " . $this->cachePrefix . "*");
+        $this->logger->warn("Failed to clear all cache: ".$this->cachePrefix."*");
         return false;
     }
 

WebStream/Module/ServiceLocator.php

Spacing +10 added lines, -10 removed lines

@@ -34,7 +34,7 @@ 
         $container = new Container();
 
         // LoggerAdapter
-        $container->logger = function () {
+        $container->logger = function() {
             $instance = Logger::getInstance();
             $instance->setOutputter([
                 new FileOutputter($instance->getConfig()->logPath)
@@ -43,30 +43,30 @@ 
             return new LoggerAdapter($instance);
         };
         // Request
-        $container->request = function () use (&$container) {
+        $container->request = function() use (&$container) {
             $request = new Request();
             $request->inject('logger', $container->logger);
 
             return $request->getContainer();
         };
         // Response
-        $container->response = function () use (&$container) {
+        $container->response = function() use (&$container) {
             $response = new Response();
             $response->inject('logger', $container->logger);
 
             return $response;
         };
         // Session
-        $container->session = function () use (&$container) {
+        $container->session = function() use (&$container) {
             $session = new Session();
             $session->inject('logger', $container->logger);
 
             return $session;
         };
         // Router
-        $container->router = function () use (&$container) {
+        $container->router = function() use (&$container) {
             // Router
-            $config = \Spyc::YAMLLoad($container->applicationInfo->applicationRoot . $container->applicationInfo->routeConfigPath);
+            $config = \Spyc::YAMLLoad($container->applicationInfo->applicationRoot.$container->applicationInfo->routeConfigPath);
             $router = new Router($config, $container->request);
             $router->inject('logger', $container->logger)
                    ->inject('applicationInfo', $container->applicationInfo);
@@ -75,20 +75,20 @@ 
             return $router->getRoutingResult();
         };
         // CoreDelegator
-        $container->coreDelegator = function () use (&$container) {
+        $container->coreDelegator = function() use (&$container) {
             return new CoreDelegator($container);
         };
         // AnnotationDelegator
-        $container->annotationDelegator = function () use (&$container) {
+        $container->annotationDelegator = function() use (&$container) {
             return new AnnotationDelegator($container);
         };
         // twig
-        $container->twig = function () {
+        $container->twig = function() {
             Twig_Autoloader::register();
         };
         // Application Info
         $applicationRoot = $this->getApplicationRoot();
-        $container->applicationInfo = function () use ($applicationRoot) {
+        $container->applicationInfo = function() use ($applicationRoot) {
             $info = new Container();
             $info->applicationRoot = $applicationRoot;
             $info->applicationDir = "app";

WebStream/Delegate/Router.php

Spacing +10 added lines, -10 removed lines

@@ -82,11 +82,11 @@ 
             // 静的ファイルへのパスがルーティングルールに定義された場合
             // パス定義された時点で弾く
             if (preg_match('/\/(img|js|css|file)(?:$|\/)/', $path)) {
-                throw new RouterException("Include the prohibit routing path: " . $path);
+                throw new RouterException("Include the prohibit routing path: ".$path);
             }
             // 許可したルーティングパス定義に合っていなければ弾く
             if (!preg_match('/^\/{1}(?:$|:?[a-zA-Z]{1}[a-zA-Z0-9-_\/\.:]{0,}$)/', $path)) {
-                throw new RouterException("Invalid path defintion: " . $path);
+                throw new RouterException("Invalid path defintion: ".$path);
             }
             // ルールとURLがマッチした場合に動的にチェックを掛ける
             // パスがマッチしたときにアクション名をチェックし、その時点で弾く
@@ -96,7 +96,7 @@ 
                 // NG例：my__blog, my_blog_
                 if (!preg_match('/^(?:([a-z]{1}(?:_(?=[a-z])|[a-z0-9])+))#(?:([a-z]{1}(?:_(?=[a-z])|[a-z0-9])+))$/', $ca, $matches)) {
                     // ルーティング定義(Controller#Action)が正しくない場合
-                    throw new RouterException("Invalid controller#action definition: " . $ca);
+                    throw new RouterException("Invalid controller#action definition: ".$ca);
                 }
             }
         }
@@ -129,7 +129,7 @@ 
             if (($this->request->pathInfo !== $path) &&
                 count(explode('/', $path)) === count(explode('/', $this->request->pathInfo))) {
                 // プレースホルダと実URLをひもづける
-                $pathPattern = "/^\/" . implode("\/", $tokens) . "$/";
+                $pathPattern = "/^\/".implode("\/", $tokens)."$/";
                 if (preg_match($pathPattern, $this->request->pathInfo, $matches)) {
                     for ($j = 1; $j < count($matches); $j++) {
                         $key = $keyList[$j - 1];
@@ -146,7 +146,7 @@ 
                 $this->setController($matches[1]);
                 $this->setAction($matches[2]);
                 $this->routingContainer->params = $placeholderedParams;
-                $this->logger->info("Routed path: " . $matches[1] . "#" . $matches[2]);
+                $this->logger->info("Routed path: ".$matches[1]."#".$matches[2]);
 
                 // ルーティングルールがマッチした場合は抜ける
                 return true;
@@ -161,7 +161,7 @@ 
      */
     private function resolveStaticFilePath()
     {
-        $staticFile = $this->applicationInfo->applicationRoot . "/app/views/" . $this->applicationInfo->publicDir . $this->request->pathInfo;
+        $staticFile = $this->applicationInfo->applicationRoot."/app/views/".$this->applicationInfo->publicDir.$this->request->pathInfo;
 
         if (is_file($staticFile)) {
             $this->routingContainer->staticFile = $staticFile;
@@ -170,10 +170,10 @@ 
             $less = new \lessc();
             $dirpath = dirname($staticFile);
             $filenameWitoutExt = pathinfo($staticFile, PATHINFO_FILENAME);
-            $lessFilepath = $dirpath . "/" . $filenameWitoutExt . ".less";
+            $lessFilepath = $dirpath."/".$filenameWitoutExt.".less";
             // lessファイルも見つからない場合はエラー
             if (!file_exists($lessFilepath)) {
-                $this->logger->error("The file of css has been specified, but not found even file of less:" . $lessFilepath);
+                $this->logger->error("The file of css has been specified, but not found even file of less:".$lessFilepath);
 
                 return;
             }
@@ -181,7 +181,7 @@ 
                 if (is_file($staticFile)) {
                     $this->routingContainer->staticFile = $staticFile;
                 } else {
-                    $this->logger->error("Failed to file create, cause parmission denied: " . $dirpath);
+                    $this->logger->error("Failed to file create, cause parmission denied: ".$dirpath);
                 }
             }
         }
@@ -195,7 +195,7 @@ 
     {
         if (isset($controller)) {
             $this->routingContainer->pageName = $this->snake2ucamel($controller);
-            $this->routingContainer->controller = $this->snake2ucamel($controller) . "Controller";
+            $this->routingContainer->controller = $this->snake2ucamel($controller)."Controller";
         }
     }
 

WebStream/Template/Basic.php

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