1. refactor

scarwu · Feb 7, 2022 · 7bfba8d · 7bfba8d
1 parent 59dd4e5
commit 7bfba8d
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 51 deletions.
diff --git a/example/Web/views/main/error.php b/example/Web/views/main/error.php
@@ -1,5 +1,5 @@
 <?php
-use Oni\Web\Helper;
+use Oni\Web\View\Helper;
 ?>
 <h1><?=$title?></h1>
 <p>Go to <?=Helper::linkTo('/', 'home')?></p>
diff --git a/src/Oni/Basic.php b/src/Oni/Basic.php
@@ -41,7 +41,7 @@ final public function setAttr($key, $value)
      */
     final public function getAttr($key)
     {
-        return isset($this->_attr[$key])
+        return (true === isset($this->_attr[$key]))
             ? $this->_attr[$key] : null;
     }
 }
diff --git a/src/Oni/CLI/App.php b/src/Oni/CLI/App.php
@@ -51,7 +51,7 @@ public function run()
         if (null !== $namespace && null !== $path) {
             Loader::append($namespace, $path);
 
-            if ($this->loadTask()) {
+            if (true === $this->loadTask()) {
                 return true;
             }
         }
@@ -75,8 +75,8 @@ private function loadTask()
             $param = ucfirst($param);
 
             if (false === file_exists("{$path}/{$param}")
-                && false === file_exists("{$path}/{$param}Task.php")) {
-
+                && false === file_exists("{$path}/{$param}Task.php")
+            ) {
                 break;
             }
 

diff --git a/src/Oni/CLI/IO.php b/src/Oni/CLI/IO.php
@@ -48,11 +48,11 @@ private function __construct()
 
         // arguments
         while ($argv) {
-            if (preg_match($configRegexRule, $argv[0])) {
+            if (true === (bool) preg_match($configRegexRule, $argv[0])) {
                 break;
             }
 
-            if (preg_match($optionRegexRule, $argv[0])) {
+            if (true === (bool) preg_match($optionRegexRule, $argv[0])) {
                 break;
             }
 
@@ -61,19 +61,19 @@ private function __construct()
 
         // options & configs
         while ($value = array_shift($argv)) {
-            if (preg_match($configRegexRule, $value, $match)) {
+            if (true === (bool) preg_match($configRegexRule, $value, $match)) {
                 $this->_configs[$match[1]] = isset($match[2]) ? $match[2] : null;
             }
 
-            if (preg_match($optionRegexRule, $value, $match)) {
+            if (true === (bool) preg_match($optionRegexRule, $value, $match)) {
                 $this->_options[$match[1]] = null;
 
                 if (isset($argv[0])) {
-                    if (preg_match($configRegexRule, $argv[0])) {
+                    if (true === (bool) preg_match($configRegexRule, $argv[0])) {
                         continue;
                     }
 
-                    if (preg_match($optionRegexRule, $argv[0])) {
+                    if (true === (bool) preg_match($optionRegexRule, $argv[0])) {
                         continue;
                     }
 
@@ -104,8 +104,8 @@ public static function init()
      */
     public function getArguments($index = null)
     {
-        if (is_integer($index)) {
-            if (array_key_exists($index, $this->_arguments)) {
+        if (true === is_integer($index)) {
+            if (true === array_key_exists($index, $this->_arguments)) {
                 return $this->_arguments[$index];
             } else {
                 return false;
@@ -134,8 +134,8 @@ public function hasArguments()
      */
     public function getOptions($key = null)
     {
-        if (is_string($key)) {
-            if (array_key_exists($key, $this->_options)) {
+        if (true === is_string($key)) {
+            if (true === array_key_exists($key, $this->_options)) {
                 return $this->_options[$key];
             } else {
                 return false;
@@ -154,7 +154,7 @@ public function getOptions($key = null)
      */
     public function hasOptions($key = null)
     {
-        if (is_string($key)) {
+        if (true === is_string($key)) {
             return array_key_exists($key, $this->_options);
         }
 
@@ -170,8 +170,8 @@ public function hasOptions($key = null)
      */
     public function getConfigs($key = null)
     {
-        if (is_string($key)) {
-            if (array_key_exists($key, $this->_configs)) {
+        if (true === is_string($key)) {
+            if (true === array_key_exists($key, $this->_configs)) {
                 return $this->_configs[$key];
             } else {
                 return false;
@@ -190,7 +190,7 @@ public function getConfigs($key = null)
      */
     public function hasConfigs($key = null)
     {
-        if (is_string($key)) {
+        if (true === is_string($key)) {
             return array_key_exists($key, $this->_configs);
         }
 
@@ -289,12 +289,12 @@ public function ask($text, $callback = null, $textColor = null, $bgColor = null)
      */
     private function color($text, $textColor = null, $bgColor = null)
     {
-        if (isset(self::$textColor[$textColor])) {
+        if (true === isset(self::$textColor[$textColor])) {
             $color = self::$textColor[$textColor];
             $text = "\033[{$color}m{$text}\033[m";
         }
 
-        if (isset(self::$bgColor[$bgColor])) {
+        if (true === isset(self::$bgColor[$bgColor])) {
             $color = self::$bgColor[$bgColor];
             $text = "\033[{$color}m{$text}\033[m";
         }

diff --git a/src/Oni/Loader.php b/src/Oni/Loader.php
@@ -36,15 +36,15 @@ private function __construct()
             foreach (self::$_namespaceList as $namespace => $pathList) {
                 $pattern = '/^' . str_replace('\\', '\\\\', $namespace) . '/';
 
-                if (!preg_match($pattern, $className)) {
+                if (false === (bool) preg_match($pattern, $className)) {
                     continue;
                 }
 
                 $className = str_replace($namespace, '', trim($className, '\\'));
                 $className = str_replace('\\', '/', trim($className, '\\'));
 
                 foreach ($pathList as $path) {
-                    if (!file_exists("{$path}/{$className}.php")) {
+                    if (false === file_exists("{$path}/{$className}.php")) {
                         continue;
                     }
 
@@ -81,7 +81,7 @@ public static function append($namespace, $path)
         $namespace = trim($namespace, '\\');
         $path = rtrim($path, '/');
 
-        if (!isset(self::$_namespaceList[$namespace])) {
+        if (false === isset(self::$_namespaceList[$namespace])) {
             self::$_namespaceList[$namespace] = [];
         }
 

diff --git a/src/Oni/Web/App.php b/src/Oni/Web/App.php
@@ -12,8 +12,8 @@
 
 use Oni\Basic;
 use Oni\Loader;
-use Oni\Web\Req;
-use Oni\Web\Res;
+use Oni\Web\Http\Req;
+use Oni\Web\Http\Res;
 use Oni\Web\View;
 
 class App extends Basic
@@ -85,7 +85,7 @@ public function run()
         if (null !== $namespace && null !== $path) {
             Loader::append($namespace, $path);
 
-            if ($this->loadController()) {
+            if (true === $this->loadController()) {
                 return true;
             }
         }
@@ -188,8 +188,8 @@ private function loadController()
             $param = ucfirst($param);
 
             if (false === file_exists("{$path}/{$param}")
-                && false === file_exists("{$path}/{$param}Controller.php")) {
-
+                && false === file_exists("{$path}/{$param}Controller.php")
+            ) {
                 break;
             }
 

diff --git a/src/Oni/Web/Controller/Ajax.php b/src/Oni/Web/Controller/Ajax.php
@@ -11,8 +11,8 @@
 namespace Oni\Web\Controller;
 
 use Oni\Basic;
-use Oni\Web\Req;
-use Oni\Web\Res;
+use Oni\Web\Http\Req;
+use Oni\Web\Http\Res;
 
 abstract class Ajax extends Basic
 {

diff --git a/src/Oni/Web/Controller/Page.php b/src/Oni/Web/Controller/Page.php
@@ -11,8 +11,8 @@
 namespace Oni\Web\Controller;
 
 use Oni\Basic;
-use Oni\Web\Req;
-use Oni\Web\Res;
+use Oni\Web\Http\Req;
+use Oni\Web\Http\Res;
 use Oni\Web\View;
 
 abstract class Page extends Basic

diff --git a/src/Oni/Web/Controller/Rest.php b/src/Oni/Web/Controller/Rest.php
@@ -11,8 +11,8 @@
 namespace Oni\Web\Controller;
 
 use Oni\Basic;
-use Oni\Web\Req;
-use Oni\Web\Res;
+use Oni\Web\Http\Req;
+use Oni\Web\Http\Res;
 
 abstract class Rest extends Basic
 {

diff --git a/src/Oni/Web/Req.php → src/Oni/Web/Http/Req.php b/src/Oni/Web/Req.php → src/Oni/Web/Http/Req.php
@@ -8,7 +8,7 @@
  * @link        https://github.com/scarwu/Oni
  */
 
-namespace Oni\Web;
+namespace Oni\Web\Http;
 
 class Req
 {
@@ -117,9 +117,9 @@ public function uri()
     {
         $uri = null;
 
-        if (isset($_SERVER['PATH_INFO'])) {
+        if (true === isset($_SERVER['PATH_INFO'])) {
             $uri = $_SERVER['PATH_INFO'];
-        } elseif (isset($_SERVER['REQUEST_URI'])) {
+        } elseif (true === isset($_SERVER['REQUEST_URI'])) {
             $uri = explode('?', $_SERVER['REQUEST_URI'])[0];
         }
 
@@ -164,9 +164,9 @@ public function content()
     public function file()
     {
         switch ($this->contentType()) {
-            case 'multipart/form-data':
-            default:
-                return $_FILES;
+        case 'multipart/form-data':
+        default:
+            return $_FILES;
         }
     }
 

diff --git a/src/Oni/Web/Res.php → src/Oni/Web/Http/Res.php b/src/Oni/Web/Res.php → src/Oni/Web/Http/Res.php
@@ -8,7 +8,7 @@
  * @link        https://github.com/scarwu/Oni
  */
 
-namespace Oni\Web;
+namespace Oni\Web\Http;
 
 class Res
 {

diff --git a/src/Oni/Web/Model.php b/src/Oni/Web/Model.php
@@ -12,7 +12,4 @@
 
 use Oni\Basic;
 
-class Model extends Basic
-{
-
-}
+class Model extends Basic {}
diff --git a/src/Oni/Web/Router.php b/src/Oni/Web/Router.php
@@ -146,7 +146,7 @@ public function addRoute($path, $callback, $method = 'get', $fullRegex = false)
     {
         $method = strtolower($method);
 
-        if (!isset($this->_rule[$method])) {
+        if (false === isset($this->_rule[$method])) {
             $method = 'get';
         }
 
@@ -182,7 +182,7 @@ public function run()
                 $path = $this->regexGenerator($path);
             }
 
-            if (preg_match($path, $this->_path, $match)) {
+            if (true === (bool) preg_match($path, $this->_path, $match)) {
                 $this->_matchRoute = $path;
                 $this->_isMatch = true;
                 $this->_rule[$this->_method]['callback'][$index](array_slice($match, 1));

diff --git a/src/Oni/Web/View.php b/src/Oni/Web/View.php
@@ -147,12 +147,12 @@ private function loadPartial($_subPath)
     {
         $_result = '';
 
-        if (is_string($_subPath)) {
+        if (true === is_string($_subPath)) {
             $_path = $this->getAttr('path');
             $_ext = $this->getAttr('ext');
             $_fullpath = "{$_path}/{$_subPath}.{$_ext}";
 
-            if (file_exists($_fullpath)) {
+            if (true === file_exists($_fullpath)) {
                 foreach ($this->data as $_key => $_value) {
                     $$_key = $_value;
                 }

diff --git a/src/Oni/Web/Helper.php → src/Oni/Web/View/Helper.php b/src/Oni/Web/Helper.php → src/Oni/Web/View/Helper.php
@@ -8,7 +8,7 @@
  * @link        https://github.com/scarwu/Oni
  */
 
-namespace Oni\Web;
+namespace Oni\Web\View;
 
 class Helper {