webstream-framework / WebStream

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

WebStream/Module/Security.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
         // 制御文字削除
         $removes = [];
         $removes[] = '/%0[0-8bcef]/'; // 00-08, 11, 12, 14, 15
-        $removes[] = '/%1[0-9a-f]/';  // 16-31
+        $removes[] = '/%1[0-9a-f]/'; // 16-31
         $removes[] = '/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]+/S'; // 00-08, 11, 12, 14-31, 127
 
         // $dataが数行にわたっている場合、一度で置換しきれないので繰り返す

WebStream/Module/Utility/CommonUtils.php

Spacing +3 added lines, -3 removed lines

@@ -74,8 +74,8 @@ 
      */
     public function camel2snake($str)
     {
-        $str = preg_replace_callback('/([A-Z])/', function ($matches) {
-            return '_' . lcfirst($matches[1]);
+        $str = preg_replace_callback('/([A-Z])/', function($matches) {
+            return '_'.lcfirst($matches[1]);
         }, $str);
 
         return preg_replace('/^_/', '', $str);
@@ -88,7 +88,7 @@ 
      */
     public function snake2ucamel($str)
     {
-        $str = ucfirst(preg_replace_callback('/_([a-zA-Z])/', function ($matches) {
+        $str = ucfirst(preg_replace_callback('/_([a-zA-Z])/', function($matches) {
             return ucfirst($matches[1]);
         }, $str));
 

WebStream/Module/Utility/FileUtils.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public function parseConfig($filepath)
     {
         // 正規化した絶対パス
-        $realpath = $this->getApplicationRoot() . DIRECTORY_SEPARATOR . $filepath;
+        $realpath = $this->getApplicationRoot().DIRECTORY_SEPARATOR.$filepath;
 
         return file_exists($realpath) ? parse_ini_file($realpath) : null;
     }

WebStream/Annotation/Container/AnnotationListContainer.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     public function seek($offset)
     {
         if (!array_key_exists($offset, $this->values)) {
-            throw new \OutOfBoundsException("Current cursor is out of range: " . $offset);
+            throw new \OutOfBoundsException("Current cursor is out of range: ".$offset);
         }
 
         return $this->values[$offset];

WebStream/Annotation/Database.php

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function onClassInject(IAnnotatable &$instance, Container $container, \ReflectionClass $class)
+    public function onClassInject(IAnnotatable&$instance, Container $container, \ReflectionClass $class)
     {
         $this->injectedLog($this);
 
@@ -58,13 +58,13 @@ 
         $config = $this->annotation->config;
 
         if (!class_exists($driver)) {
-            throw new DatabaseException("Database driver is undefined：" . $driver);
+            throw new DatabaseException("Database driver is undefined：".$driver);
         }
 
-        $configPath = $container->applicationInfo->applicationRoot . "/" . $config;
+        $configPath = $container->applicationInfo->applicationRoot."/".$config;
         $configRealPath = realpath($configPath);
         if (!file_exists($configRealPath)) {
-            throw new DatabaseException("Database config file is not found: " . $configPath);
+            throw new DatabaseException("Database config file is not found: ".$configPath);
         }
 
         $this->injectedContainer->filepath = $class->getFileName();

WebStream/Annotation/Header.php

Spacing +6 added lines, -6 removed lines

@@ -79,7 +79,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function onMethodInject(IAnnotatable &$instance, Container $container, \ReflectionMethod $method)
+    public function onMethodInject(IAnnotatable&$instance, Container $container, \ReflectionMethod $method)
     {
         $this->injectedLog($this);
 
@@ -94,22 +94,22 @@ 
 
             for ($i = 0; $i < count($allowMethods); $i++) {
                 if (!preg_match("/^(?:(?:P(?:OS|U)|GE)T|(?:p(?:os|u)|ge)t|DELETE|delete)$/", $allowMethods[$i])) {
-                    $errorMsg = "Invalid value '" . $allowMethods[$i] . "' in 'allowMethod' attribute of @Header.";
+                    $errorMsg = "Invalid value '".$allowMethods[$i]."' in 'allowMethod' attribute of @Header.";
                     throw new AnnotationException($errorMsg);
                 }
                 $allowMethods[$i] = strtoupper($allowMethods[$i]);
             }
 
             $action = $this->camel2snake($container->router->action);
-            $classpathWithAction = $method->class . "#" . $action;
+            $classpathWithAction = $method->class."#".$action;
 
             // 複数指定した場合、一つでも許可されていればOK
             if (!$this->inArray($container->request->requestMethod, $allowMethods)) {
-                $errorMsg = "Not allowed request method '" . $container->request->requestMethod . "' in " . $classpathWithAction;
+                $errorMsg = "Not allowed request method '".$container->request->requestMethod."' in ".$classpathWithAction;
                 throw new InvalidRequestException($errorMsg);
             }
 
-            $this->logger->debug("Accepted request method '" . $container->request->requestMethod . "' in " . $classpathWithAction);
+            $this->logger->debug("Accepted request method '".$container->request->requestMethod."' in ".$classpathWithAction);
 
             if ($ext !== null) {
                 $contentType = $this->contentTypeList[$ext];
@@ -117,7 +117,7 @@ 
                     $errorMsg = "Invalid value '$ext' in 'contentType' attribute of @Header.";
                     throw new AnnotationException($errorMsg);
                 }
-                $this->logger->debug("Accepted contentType '$ext' in " . $classpathWithAction);
+                $this->logger->debug("Accepted contentType '$ext' in ".$classpathWithAction);
             }
         }
     }

WebStream/Annotation/ExceptionHandler.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     /**
      * {@inheritdoc}
      */
-    public function onMethodInject(IAnnotatable &$instance, Container $container, \ReflectionMethod $method)
+    public function onMethodInject(IAnnotatable&$instance, Container $container, \ReflectionMethod $method)
     {
         $this->injectedLog($this);
 

Unused Use Statements -1 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;

WebStream/Annotation/Reader/AnnotationReader.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
      * @param IAnnotatable アノテーション使用可能インスタンス
      * @param Container 依存コンテナ
      */
-    public function __construct(IAnnotatable &$instance, Container $container)
+    public function __construct(IAnnotatable&$instance, Container $container)
     {
         $this->instance = $instance;
         $this->container = $container;
@@ -252,7 +252,7 @@ 
                         $annotation->onPropertyInject($this->instance, $this->container, $property);
                     } catch (\Exception $e) {
                         if ($this->exception === null) {
-                            $this->exception = function () use ($e) {
+                            $this->exception = function() use ($e) {
                                 throw $e;
                             };
                         }

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
     /**
      * Constructor
-     * @param Container 依存コンテナ
+     * @param Container Container
      */
     public function __construct(Container $container)
     {