webstream-framework / WebStream

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

WebStream/Delegate/AnnotationDelegatorFactory.php

Doc Comments +10 added lines, -9 removed lines

@@ -55,7 +55,8 @@ 
     /**
      * CustomAnnotation結果を返却する
      * @param  string アノテーションID
-     * @return Callable CustomAnnotation結果
+     * @param string $annotationId
+     * @return \Closure CustomAnnotation結果
      */
     public function createAnnotationCallable($annotationId)
     {
@@ -94,7 +95,7 @@ 
 
     /**
      * CustomAnnotation結果を返却する
-     * @return Callable CustomAnnotation結果
+     * @return \Closure CustomAnnotation結果
      */
     public function createCustomAnnotationCallable()
     {
@@ -111,7 +112,7 @@ 
     /**
      * Header結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Header結果
+     * @return \Closure Header結果
      */
     private function createHeader($containerList)
     {
@@ -129,7 +130,7 @@ 
     /**
      * Filter結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Filter結果
+     * @return \Closure Filter結果
      */
     private function createFilter($containerList)
     {
@@ -213,7 +214,7 @@ 
     /**
      * Template結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Template結果
+     * @return \Closure Template結果
      */
     private function createTemplate($containerList)
     {
@@ -229,7 +230,7 @@ 
     /**
      * ExceptionHandler結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable ExceptionHandler結果
+     * @return \Closure ExceptionHandler結果
      */
     private function createExceptionHandler($containerList)
     {
@@ -241,7 +242,7 @@ 
     /**
      * Database結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Database結果
+     * @return \Closure Database結果
      */
     private function createDatabase($containerList)
     {
@@ -253,7 +254,7 @@ 
     /**
      * Query結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Query結果
+     * @return \Closure Query結果
      */
     private function createQuery($containerList)
     {
@@ -265,7 +266,7 @@ 
     /**
      * Alias結果を返却する
      * @param  array<AnnotationContainer> アノテーションコンテナリスト
-     * @return Callable Alias結果
+     * @return \Closure Alias結果
      */
     private function createAlias($containerList)
     {

Spacing +10 added lines, -10 removed lines

@@ -103,7 +103,7 @@ 
             unset($injectedAnnotation[$annotationKey]);
         }
 
-        return function () use ($injectedAnnotation) {
+        return function() use ($injectedAnnotation) {
             return $injectedAnnotation;
         };
     }
@@ -115,7 +115,7 @@ 
      */
     private function createHeader($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $headerContainer = new Container();
             $headerContainer->mimeType = "html";
             if ($containerList !== null) {
@@ -133,7 +133,7 @@ 
      */
     private function createFilter($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $filterListContainer = new Container();
             $filterListContainer->initialize = new AnnotationListContainer();
             $filterListContainer->before     = new AnnotationListContainer();
@@ -145,7 +145,7 @@ 
                 // アクションメソッドの@Filter(type="skip")をチェックする
                 // 1メソッドに対して複数の@Filterが指定されてもエラーにはしない
                 foreach ($containerList as $filterAnnotation) {
-                    if ($filterAnnotation->classpath . "#" . $filterAnnotation->action === $filterAnnotation->method->class . "#" . $filterAnnotation->method->name) {
+                    if ($filterAnnotation->classpath."#".$filterAnnotation->action === $filterAnnotation->method->class."#".$filterAnnotation->method->name) {
                         if ($filterAnnotation->annotation->type === 'skip') {
                             $exceptMethods = $filterAnnotation->annotation->except;
                             if (!is_array($exceptMethods)) {
@@ -217,7 +217,7 @@ 
      */
     private function createTemplate($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             $templateContainer = new Container(false);
             $templateContainer->engine = $containerList !== null ? $containerList[0]->engine : null;
             $templateContainer->cacheTime = $containerList !== null ? $containerList[0]->cacheTime : null;
@@ -233,7 +233,7 @@ 
      */
     private function createExceptionHandler($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList === null ? [] : $containerList;
         };
     }
@@ -245,7 +245,7 @@ 
      */
     private function createDatabase($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList;
         };
     }
@@ -257,7 +257,7 @@ 
      */
     private function createQuery($containerList)
     {
-        return function () use ($containerList) {
+        return function() use ($containerList) {
             return $containerList;
         };
     }
@@ -269,8 +269,8 @@ 
      */
     private function createAlias($containerList)
     {
-        return function () use ($containerList) {
-            return $containerList === null ? [] : $containerList;;
+        return function() use ($containerList) {
+            return $containerList === null ? [] : $containerList; ;
         };
     }
 }

WebStream/Delegate/CoreDelegator.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +21 added lines, -21 removed lines

@@ -72,66 +72,66 @@ 
         $classLoader->inject('logger', $container->logger)
                     ->inject('applicationInfo', $container->applicationInfo);
         $pageName = $this->getPageName();
-        $serviceClassName = $pageName . "Service";
-        $modelClassName   = $pageName . "Model";
-        $helperClassName  = $pageName . "Helper";
+        $serviceClassName = $pageName."Service";
+        $modelClassName   = $pageName."Model";
+        $helperClassName  = $pageName."Helper";
         $controllerNamespace = $this->getNamespace($container->router->controller);
         $serviceNamespace    = $this->getNamespace($serviceClassName);
         $modelNamespace      = $this->getNamespace($modelClassName);
         $helperNamespace     = $this->getNamespace($helperClassName);
 
         // Controller
-        $this->coreContainer->controller = function () use ($container, $controllerNamespace) {
-            $controllerClassPath = $controllerNamespace . "\\" . $container->router->controller;
+        $this->coreContainer->controller = function() use ($container, $controllerNamespace) {
+            $controllerClassPath = $controllerNamespace."\\".$container->router->controller;
             if (!class_exists($controllerClassPath)) {
-                throw new ClassNotFoundException("Undefined class path: " . $controllerClassPath);
+                throw new ClassNotFoundException("Undefined class path: ".$controllerClassPath);
             }
 
             return new $controllerClassPath($container);
         };
 
         // View
-        $this->coreContainer->view = function () use ($container) {
+        $this->coreContainer->view = function() use ($container) {
             return new CoreView($container);
         };
 
         // Service
         if ($serviceNamespace !== null) {
-            $serviceClassPath = $serviceNamespace . "\\" . $serviceClassName;
-            $this->coreContainer->service = function () use ($container, $classLoader, $serviceClassPath, $serviceClassName) {
-                if ($classLoader->import($container->applicationInfo->applicationDir . "/services/" . $serviceClassName . ".php")) {
+            $serviceClassPath = $serviceNamespace."\\".$serviceClassName;
+            $this->coreContainer->service = function() use ($container, $classLoader, $serviceClassPath, $serviceClassName) {
+                if ($classLoader->import($container->applicationInfo->applicationDir."/services/".$serviceClassName.".php")) {
                     return new $serviceClassPath($container);
                 }
             };
         } else {
-            $this->coreContainer->service = function () {};
+            $this->coreContainer->service = function() {};
         }
 
         // Model
         if ($modelNamespace !== null) {
-            $modelClassPath = $modelNamespace . "\\" . $modelClassName;
-            $this->coreContainer->model = function () use ($container, $classLoader, $modelClassPath, $modelClassName) {
-                if ($classLoader->import($container->applicationInfo->applicationDir . "/models/" . $modelClassName . ".php")) {
+            $modelClassPath = $modelNamespace."\\".$modelClassName;
+            $this->coreContainer->model = function() use ($container, $classLoader, $modelClassPath, $modelClassName) {
+                if ($classLoader->import($container->applicationInfo->applicationDir."/models/".$modelClassName.".php")) {
                     return new $modelClassPath($container);
                 }
             };
         } else {
             $classpath = "\WebStream\Exception\Extend\ClassNotFoundException";
-            $message = $pageName . "Service and " . $pageName . "Model is not defined.";
+            $message = $pageName."Service and ".$pageName."Model is not defined.";
             $this->coreContainer->model = new CoreExceptionDelegator($classpath, $message);
         }
 
         // Helper
         if ($helperNamespace !== null) {
-            $helperClassPath = $helperNamespace . "\\" . $helperClassName;
-            $this->coreContainer->helper = function () use ($container, $classLoader, $helperClassPath, $helperClassName) {
-                if ($classLoader->import($container->applicationInfo->applicationDir . "/helpers/" . $helperClassName . ".php")) {
+            $helperClassPath = $helperNamespace."\\".$helperClassName;
+            $this->coreContainer->helper = function() use ($container, $classLoader, $helperClassPath, $helperClassName) {
+                if ($classLoader->import($container->applicationInfo->applicationDir."/helpers/".$helperClassName.".php")) {
                     return new $helperClassPath($container);
                 }
             };
         } else {
             $classpath = "\WebStream\Exception\Extend\ClassNotFoundException";
-            $message = $pageName . "Helper is not defined.";
+            $message = $pageName."Helper is not defined.";
             $this->coreContainer->helper = new CoreExceptionDelegator($classpath, $message);
         }
     }
@@ -144,12 +144,12 @@ 
     public function getNamespace($className)
     {
         $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($this->container->applicationInfo->applicationRoot . "/app"),
+            new \RecursiveDirectoryIterator($this->container->applicationInfo->applicationRoot."/app"),
             \RecursiveIteratorIterator::LEAVES_ONLY,
             \RecursiveIteratorIterator::CATCH_GET_CHILD // for Permission deny
         );
         foreach ($iterator as $filepath => $fileObject) {
-            if (strpos($filepath, $className . ".php") !== false) {
+            if (strpos($filepath, $className.".php") !== false) {
                 return $this->getDefinedNamespace($filepath);
             }
         }

WebStream/Delegate/Resolver.php

Doc Comments +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
 
     /**
      * Viewを起動する
-     * @return CoreView Viewオブジェクト
+     * @return CoreExecuteDelegator Viewオブジェクト
      */
     public function runView()
     {

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use WebStream\Core\CoreHelper;
 use WebStream\Module\Container;
 use WebStream\Module\Utility\FileUtils;
-use WebStream\Exception\Extend\RouterException;
 use WebStream\Exception\Extend\ResourceNotFoundException;
 
 /**

Spacing +3 added lines, -3 removed lines

@@ -74,9 +74,9 @@ 
         $this->response->start();
 
         if ($this->router->controller !== null && $this->router->action !== null) {
-            $iterator = $this->getFileSearchIterator($this->container->applicationInfo->applicationRoot . "/app/controllers");
+            $iterator = $this->getFileSearchIterator($this->container->applicationInfo->applicationRoot."/app/controllers");
             foreach ($iterator as $filepath => $fileObject) {
-                if (strpos($filepath, $this->router->controller . ".php") !== false) {
+                if (strpos($filepath, $this->router->controller.".php") !== false) {
                     include_once $filepath;
                 }
             }
@@ -87,7 +87,7 @@ 
             $controller->__callStaticFile($this->router->staticFile);
         } else {
             $this->response->clean();
-            $errorMsg = "Failed to resolve the routing: " . $this->request->requestUri;
+            $errorMsg = "Failed to resolve the routing: ".$this->request->requestUri;
             throw new ResourceNotFoundException($errorMsg);
         }
 

WebStream/Delegate/Router.php

Doc Comments +3 added lines, -1 removed lines

@@ -34,7 +34,7 @@ 
 
     /**
      * コンストラクタ
-     * @param Request リクエストオブジェクト
+     * @param Request Container
      */
     public function __construct(array $rules, Container $request)
     {
@@ -190,6 +190,7 @@ 
     /**
      * コントローラを設定する
      * @param string コントローラ文字列
+     * @param string $controller
      */
     private function setController($controller)
     {
@@ -202,6 +203,7 @@ 
     /**
      * アクションを設定する
      * @param string アクション文字列
+     * @param string $action
      */
     private function setAction($action)
     {

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/DI/Injector.php

Doc Comments +1 added lines

@@ -17,6 +17,7 @@
      * オブジェクトを注入する
      * @param string プロパティ名
      * @param mixed オブジェクト
+     * @param string $name
      * @return Injector
      */
     public function inject($name, $object)

WebStream/DI/ServiceLocator.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     /**
      * コンテナを作成する
      * @param boolean テスト環境フラグ
-     * @return object コンテナ
+     * @return Container コンテナ
      */
     public function getContainer()
     {

Indentation +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
             $config = \Spyc::YAMLLoad($container->applicationInfo->applicationRoot . $container->applicationInfo->routeConfigPath);
             $router = new Router($config, $container->request);
             $router->inject('logger', $container->logger)
-                   ->inject('applicationInfo', $container->applicationInfo);
+                    ->inject('applicationInfo', $container->applicationInfo);
             $router->resolve();
 
             return $router->getRoutingResult();

Spacing +9 added lines, -9 removed lines

@@ -33,34 +33,34 @@ 
         $container = new Container();
 
         // LoggerAdapter
-        $container->logger = function () {
+        $container->logger = function() {
             return new LoggerAdapter(Logger::getInstance());
         };
         // 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);
@@ -69,15 +69,15 @@ 
             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

WebStream/Exception/ApplicationException.php

Doc Comments +1 added lines

@@ -13,6 +13,7 @@
 {
     /**
      * constructor
+     * @param \Exception $exception
      */
     public function __construct($message, $code = 500, $exception = null)
     {

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
             $exception = $this;
         }
 
-        Logger::error(get_class($exception) . " is thrown: " . $exception->getFile() . "(" . $exception->getLine() . ")");
+        Logger::error(get_class($exception)." is thrown: ".$exception->getFile()."(".$exception->getLine().")");
         if (!empty($message)) {
             Logger::error($this->getMessage(), $this->getTraceAsString());
         }