webstream-framework / WebStream

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/Validate.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function onMethodInject(IAnnotatable &$instance, Container $container, \ReflectionMethod $method)
+    public function onMethodInject(IAnnotatable&$instance, Container $container, \ReflectionMethod $method)
     {
         $this->injectedLog($this);
 
@@ -55,7 +55,7 @@ 
         $this->injectedContainer->isValid = false;
 
         if ($method !== null && !$this->inArray($method, ["get", "post", "put", "delete"])) {
-            $errorMsg = "Invalid method attribute is specified: " . safetyOut($method);
+            $errorMsg = "Invalid method attribute is specified: ".safetyOut($method);
             throw new AnnotationException($errorMsg);
         }
 
@@ -68,35 +68,35 @@ 
                         ->inject('applicationInfo', $container->applicationInfo);
 
             // デフォルトバリデーションルールのパス
-            $filepath = $container->applicationInfo->validateRuleDir . $className . ".php";
+            $filepath = $container->applicationInfo->validateRuleDir.$className.".php";
             if (!$classLoader->import($filepath)) {
                 $loadList = $classLoader->load($className);
                 // バリデーションルールのクラス名が複数指定されている場合は適用判断不可能なのでエラー
                 if (count($loadList) >= 2) {
-                    $errorMsg = "Class load failed because the same class name has been identified: " . $className . "";
+                    $errorMsg = "Class load failed because the same class name has been identified: ".$className."";
                     throw new ValidateException($errorMsg);
                 }
 
                 if (count($loadList) === 0) {
-                    $errorMsg = "Invalid Validate class filepath: " . $filepath . "";
+                    $errorMsg = "Invalid Validate class filepath: ".$filepath."";
                     throw new ValidateException($errorMsg);
                 }
 
                 $namespace = $this->getNamespace($loadList[0]);
-                $classpath = $namespace . "\\" . $className;
+                $classpath = $namespace."\\".$className;
             }
 
             $root = $container->applicationInfo->applicationRoot;
-            $classpath = $classpath ?: $this->getNamespace($root . "/" . $filepath) . "\\" . $className;
+            $classpath = $classpath ?: $this->getNamespace($root."/".$filepath)."\\".$className;
 
             if (!class_exists($classpath)) {
-                $errorMsg = "Invalid Validate class's classpath: " . $classpath;
+                $errorMsg = "Invalid Validate class's classpath: ".$classpath;
                 throw new AnnotationException($errorMsg);
             }
 
             $validateInstance = new $classpath();
             if ($validateInstance instanceof WebStream\Validate\IValidate) {
-                $errorMsg = get_class($validateInstance) . " must be IValidate instance.";
+                $errorMsg = get_class($validateInstance)." must be IValidate instance.";
                 throw new AnnotationException($errorMsg);
             }
 
@@ -118,7 +118,7 @@ 
                     $params = $container->request->delete;
                 }
             } else {
-                $errorMsg = "Unsupported method is specified: " . safetyOut($method);
+                $errorMsg = "Unsupported method is specified: ".safetyOut($method);
                 throw new AnnotationException($errorMsg);
             }
 
@@ -127,11 +127,11 @@ 
             $value = is_array($params) && array_key_exists($key, $params) ? $params[$key] : null;
 
             if (!$validateInstance->isValid($value, $rule)) {
-                $errorMsg = "Validation rule error. Rule is '$rule', value is " . (safetyOut($value) ?: "null");
+                $errorMsg = "Validation rule error. Rule is '$rule', value is ".(safetyOut($value) ?: "null");
                 throw new ValidateException($errorMsg);
             }
         } else {
-            $errorMsg = "Invalid validation rule definition: " . $rule;
+            $errorMsg = "Invalid validation rule definition: ".$rule;
             throw new ValidateException($errorMsg);
         }
     }

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/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)
     {

WebStream/Annotation/Autowired.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function onPropertyInject(IAnnotatable &$instance, Container $container, \ReflectionProperty $property)
+    public function onPropertyInject(IAnnotatable&$instance, Container $container, \ReflectionProperty $property)
     {
         $this->injectedLog($this);
 
@@ -78,7 +78,7 @@ 
             }
         } else {
             // 不明な属性が指定された場合、警告を出す
-            $key = $property->class . "." . $property->name;
+            $key = $property->class.".".$property->name;
             $this->logger->warn("An unknown attribute is specified in $key.");
         }
     }

WebStream/Annotation/Query.php

Spacing +4 added lines, -4 removed lines

@@ -52,11 +52,11 @@ 
     /**
      * {@inheritdoc}
      */
-    public function onMethodInject(IAnnotatable &$instance, Container $container, \ReflectionMethod $method)
+    public function onMethodInject(IAnnotatable&$instance, Container $container, \ReflectionMethod $method)
     {
         $this->injectedLog($this);
 
-        $key = $method->class . "#" . $method->name;
+        $key = $method->class."#".$method->name;
         if ($this->injectedContainer->{$key} === null) {
             $this->injectedContainer->{$key} = new AnnotationListContainer();
         }
@@ -65,13 +65,13 @@ 
             $files = [$files];
         }
 
-        $this->injectedContainer->{$key}->pushAsLazy(function () use ($files) {
+        $this->injectedContainer->{$key}->pushAsLazy(function() use ($files) {
             $xmlObjectList = [];
             foreach ($files as $file) {
                 if (file_exists($file)) {
                     $xmlObject = simplexml_load_file($file);
                     if ($xmlObject === false) {
-                        throw new DatabaseException("Failded to parse query file: " . $file);
+                        throw new DatabaseException("Failded to parse query file: ".$file);
                     }
                     $xmlObjectList[] = $xmlObject;
                 }

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/Alias.php

Spacing +2 added lines, -2 removed lines

@@ -50,13 +50,13 @@
     /**
      * {@inheritdoc}
      */
-    public function onMethodInject(IAnnotatable &$instance, Container $container, \ReflectionMethod $method)
+    public function onMethodInject(IAnnotatable&$instance, Container $container, \ReflectionMethod $method)
     {
         $this->injectedLog($this);
 
         $aliasMethodName = $this->annotation->name;
         if (!preg_match('/^[a-zA-Z_][a-zA-Z0-9_]{0,}$/', $aliasMethodName)) {
-            throw new AnnotationException("Alias method is invalid: " . $aliasMethodName);
+            throw new AnnotationException("Alias method is invalid: ".$aliasMethodName);
         }
 
         $this->injectedContainer->{$aliasMethodName} = $method->name;

WebStream/Annotation/Base/IClass.php

Spacing +1 added lines, -1 removed lines

@@ -18,5 +18,5 @@
      * @param Container 依存コンテナ
      * @param ReflectionClass リフレクションクラスオブジェクト
      */
-    public function onClassInject(IAnnotatable &$instance, Container $container, \ReflectionClass $class);
+    public function onClassInject(IAnnotatable&$instance, Container $container, \ReflectionClass $class);
 }