webstream-framework / WebStream

WebStream/Annotation/Template.php

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;

Spacing +9 added lines, -9 removed lines

@@ -53,7 +53,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function onMethodInject(IAnnotatable &$instance, Container $container, \ReflectionMethod $method)
+    public function onMethodInject(IAnnotatable&$instance, Container $container, \ReflectionMethod $method)
     {
         $this->injectedLog($this);
 
@@ -64,17 +64,17 @@ 
 
         if (PHP_OS === "WIN32" || PHP_OS === "WINNT") {
             if (preg_match("/^.*[. ]|.*[\p{Cntrl}\/:*?\"<>|].*|(?i:CON|PRN|AUX|CLOCK\$|NUL|COM[1-9]|LPT[1-9])(?:[.].+)?$/", $filename)) {
-                throw new AnnotationException("Invalid string contains in @Template('" . safetyOut($filename) . "')");
+                throw new AnnotationException("Invalid string contains in @Template('".safetyOut($filename)."')");
             }
         } else {
             if (preg_match("/:|\.\.\/|\.\.\\\\/", $filename)) {
-                throw new AnnotationException("Invalid string contains in @Template('" . safetyOut($filename) . "')");
+                throw new AnnotationException("Invalid string contains in @Template('".safetyOut($filename)."')");
             }
         }
 
         if ($filename === null) {
-            $errorMsg = "Invalid argument of @Template('" . safetyOut($filename) . "'). ";
-            $errorMsg.= "There is no specification of the base template.";
+            $errorMsg = "Invalid argument of @Template('".safetyOut($filename)."'). ";
+            $errorMsg .= "There is no specification of the base template.";
             throw new AnnotationException($errorMsg);
         }
 
@@ -83,8 +83,8 @@ 
         if ($engine === "twig") {
             if (!is_bool($debug)) {
                 if ($debug !== null) {
-                    $errorMsg = "Invalid argument of @Template('" . safetyOut($filename) . "'). ";
-                    $errorMsg.= "'debug' attribute bool only be specified.";
+                    $errorMsg = "Invalid argument of @Template('".safetyOut($filename)."'). ";
+                    $errorMsg .= "'debug' attribute bool only be specified.";
                     throw new AnnotationException($errorMsg);
                 }
                 $debug = false;
@@ -115,7 +115,7 @@ 
 
                 $cacheTime = intval($cacheTime);
                 if ($cacheTime <= 0) {
-                    $errorMsg = "Expire value is out of integer range: @Template(cacheTime=" . strval($cacheTime) . ")";
+                    $errorMsg = "Expire value is out of integer range: @Template(cacheTime=".strval($cacheTime).")";
                     throw new AnnotationException($errorMsg);
                 } elseif ($cacheTime >= PHP_INT_MAX) {
                     $this->logger->warn("Expire value converted the maximum of PHP Integer.");
@@ -126,7 +126,7 @@ 
 
             $this->injectedContainer->engine = new Basic($container);
         } else {
-            $errorMsg = "Invalid 'engine' attribute of @Template('" . safetyOut($filename) . "'.";
+            $errorMsg = "Invalid 'engine' attribute of @Template('".safetyOut($filename)."'.";
             throw new AnnotationException($errorMsg);
         }
     }

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\DI\ServiceLocator;
 use WebStream\Exception\Extend\ValidateException;
 use WebStream\Exception\Extend\AnnotationException;
 

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

WebStream/Core/Application.php

Doc Comments +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 
     /**
      * アプリケーション共通で使用するクラスを初期化する
-     * @param Container DIコンテナ
+     * @param Container Container
      */
     public function __construct(Container $container)
     {

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
  */
 
 use WebStream\Module\Security;
-use WebStream\DI\ServiceLocator;
 use WebStream\Log\Logger;
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
     public function shutdownHandler()
     {
         if ($error = error_get_last()) {
-            $errorMsg = $error['message'] . " " . $error['file'] . "(" . $error['line'] . ")";
+            $errorMsg = $error['message']." ".$error['file']."(".$error['line'].")";
             switch ($error['type']) {
                 case E_ERROR:
                 case E_CORE_ERROR:

WebStream/Core/CoreModel.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use WebStream\Annotation\Filter;
 use WebStream\Annotation\Base\IAnnotatable;
 use WebStream\Database\DatabaseManager;
-use WebStream\Database\Result;
 use WebStream\Exception\Extend\DatabaseException;
 use WebStream\Exception\Extend\MethodNotFoundException;
 

Indentation +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     }
 
     /**
-    * {@inheritdoc}
+     * {@inheritdoc}
      */
     public function __customAnnotation(array $annotation)
     {

Spacing +8 added lines, -8 removed lines

@@ -154,7 +154,7 @@ 
                         $result = $this->manager->query($sql)->{$method}();
                     }
                 } else {
-                    throw new DatabaseException("Invalid SQL or bind parameters: " . $sql .", " . strval($bind));
+                    throw new DatabaseException("Invalid SQL or bind parameters: ".$sql.", ".strval($bind));
                 }
             } else {
                 $bind = null;
@@ -176,7 +176,7 @@ 
                 }
 
                 $namespace = substr($this->getNamespace($filepath), 1);
-                $queryKey = $namespace . "\\" . basename($filepath, ".php") . "#" . $modelMethod;
+                $queryKey = $namespace."\\".basename($filepath, ".php")."#".$modelMethod;
 
                 $query = null;
                 foreach ($this->queryAnnotations as $queryAnnotation) {
@@ -204,7 +204,7 @@ 
                 }
 
                 if ($query === null) {
-                    throw new DatabaseException("SQL statement can't getting from xml file: " . $modelMethod);
+                    throw new DatabaseException("SQL statement can't getting from xml file: ".$modelMethod);
                 }
 
                 $sql = $query["sql"];
@@ -213,7 +213,7 @@ 
 
                 if ($entityClassPath !== null) {
                     if (!class_exists($entityClassPath)) {
-                        throw new DatabaseException("Entity classpath is not found: " . $entityClassPath);
+                        throw new DatabaseException("Entity classpath is not found: ".$entityClassPath);
                     }
 
                     switch ($method) {
@@ -225,9 +225,9 @@ 
                                     $result = $this->manager->query($sql)->select()->toEntity($entityClassPath);
                                 }
                             } else {
-                                $errorMessage = "Invalid SQL or bind parameters: " . $sql;
+                                $errorMessage = "Invalid SQL or bind parameters: ".$sql;
                                 if (is_array($bind)) {
-                                    $errorMessage .= ", " . strval($bind);
+                                    $errorMessage .= ", ".strval($bind);
                                 }
 
                                 throw new DatabaseException($errorMessage);
@@ -251,9 +251,9 @@ 
                             $result = $this->manager->query($sql)->{$method}();
                         }
                     } else {
-                        $errorMessage = "Invalid SQL or bind parameters: " . $sql;
+                        $errorMessage = "Invalid SQL or bind parameters: ".$sql;
                         if (is_array($bind)) {
-                            $errorMessage .= ", " . strval($bind);
+                            $errorMessage .= ", ".strval($bind);
                         }
 
                         throw new DatabaseException($errorMessage);

WebStream/Database/ConnectionManager.php

Doc Comments +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 
     /**
      * constructor
-     * @param Container 依存コンテナ
+     * @param Container Container
      */
     public function __construct(Container $container)
     {
@@ -53,7 +53,7 @@ 
 
     /**
      * 初期処理
-     * @param Container 依存コンテナ
+     * @param Container Container
      */
     private function initialize(Container $container)
     {

Spacing +2 added lines, -2 removed lines

@@ -77,14 +77,14 @@
             $dsnHash = "";
             $databaseConfigContainer = new Container(false);
             foreach ($config as $key => $value) {
-                $dsnHash .= $key . $value;
+                $dsnHash .= $key.$value;
                 $databaseConfigContainer->set($key, $value);
             }
             $dsnHash = md5($dsnHash);
 
             $this->classpathMap[$container->filepath] = $dsnHash;
 
-            $this->connectionContainer->{$dsnHash} = function () use ($driverClassPath, $databaseConfigContainer, $logger) {
+            $this->connectionContainer->{$dsnHash} = function() use ($driverClassPath, $databaseConfigContainer, $logger) {
                 $driver = new $driverClassPath($databaseConfigContainer);
                 $driver->inject('logger', $logger);
 

WebStream/Database/DatabaseManager.php

Doc Comments +2 added lines, -1 removed lines

@@ -37,7 +37,7 @@ 
 
     /**
      * constructor
-     * @param Container 依存コンテナ
+     * @param Container Container
      */
     public function __construct(Container $container)
     {
@@ -183,6 +183,7 @@ 
      * クエリを設定する
      * @param string SQL
      * @param array<string> パラメータ
+     * @param string $sql
      */
     public function query($sql, array $bind = [])
     {

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
             $isolationLevel === Connection::TRANSACTION_SERIALIZABLE) {
             $this->connection->setTransactionIsolation($isolationLevel);
         } else {
-            throw new DatabaseException("Invalid transaction isolation level: " . $isolationLevel);
+            throw new DatabaseException("Invalid transaction isolation level: ".$isolationLevel);
         }
 
         $this->logger->debug("Transaction start.");

WebStream/Database/Driver/DatabaseDriver.php

Doc Comments +1 added lines

@@ -113,6 +113,7 @@
     /**
      * SQLをセットしてステートメントを返却する
      * @param string SQL
+     * @param string $sql
      * @return object ステートメント
      */
     public function getStatement($sql)

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 
 use WebStream\DI\Injector;
 use WebStream\Module\Container;
-use Doctrine\DBAL\Connection;
 
 /**
  * DatabaseDriver

WebStream/Database/Query.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 
     /**
      * SELECT
-     * @return object 取得結果
+     * @return Result 取得結果
      */
     public function select()
     {

Spacing +2 added lines, -2 removed lines

@@ -120,9 +120,9 @@
         try {
             $stmt = $this->driver->getStatement($this->sql);
             if ($stmt === false) {
-                throw new DatabaseException("Can't create statement: ". $this->sql);
+                throw new DatabaseException("Can't create statement: ".$this->sql);
             }
-            $this->logger->info("Executed SQL: " . $this->sql);
+            $this->logger->info("Executed SQL: ".$this->sql);
             foreach ($this->bind as $key => $value) {
                 $this->logger->info("Bind statement: $key => $value");
                 if (preg_match("/^[0-9]+$/", $value) && is_int($value)) {

WebStream/Delegate/AnnotationDelegator.php

Doc Comments +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     /**
      * Constructor
      * @param CoreInterface インスタンス
-     * @param Container DIContainer
+     * @param Container Container
      */
     public function __construct(Container $container)
     {
@@ -54,7 +54,7 @@ 
      * @param object インスタンス
      * @param string メソッド
      * @param string アノテーションクラスパス
-     * @return Container コンテナ
+     * @return null|AnnotationContainer コンテナ
      */
     public function read($instance, $method = null, $classpath = null)
     {

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
     public function read($instance, $method = null, $classpath = null)
     {
         if (!$instance instanceof IAnnotatable) {
-            $this->logger->warn("Annotation is not available this class: " . get_class($instance));
+            $this->logger->warn("Annotation is not available this class: ".get_class($instance));
             return;
         }