1. refactor

scarwu · Feb 9, 2022 · ad361c7 · ad361c7
1 parent ea738d8
commit ad361c7
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 18 deletions.
diff --git a/src/Oni/CLI/App.php b/src/Oni/CLI/App.php
@@ -10,8 +10,8 @@
 
 namespace Oni\CLI;
 
-use Oni\Basic;
-use Oni\Loader;
+use Oni\Core\Basic;
+use Oni\Core\Loader;
 use Oni\CLI\IO;
 
 class App extends Basic

diff --git a/src/Oni/CLI/IO.php b/src/Oni/CLI/IO.php
@@ -10,7 +10,7 @@
 
 namespace Oni\CLI;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 use Oni\CLI\Helper\ANSIEscapeCode as AEC;
 
 class IO extends Basic

diff --git a/src/Oni/CLI/Task.php b/src/Oni/CLI/Task.php
@@ -10,7 +10,7 @@
 
 namespace Oni\CLI;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 use Oni\CLI\IO;
 
 abstract class Task extends Basic

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

diff --git a/src/Oni/Core/DI.php b/src/Oni/Core/DI.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * DI
+ *
+ * @package     Oni
+ * @author      Scar Wu
+ * @copyright   Copyright (c) Scar Wu (https://scar.tw)
+ * @link        https://github.com/scarwu/Oni
+ */
+
+namespace Oni\Core;
+
+final class DI {}
diff --git a/src/Oni/Loader.php → src/Oni/Core/Loader.php b/src/Oni/Loader.php → src/Oni/Core/Loader.php
@@ -8,9 +8,9 @@
  * @link        https://github.com/scarwu/Oni
  */
 
-namespace Oni;
+namespace Oni\Core;
 
-class Loader
+final class Loader
 {
     /**
      * @var object

diff --git a/src/Oni/Web/App.php b/src/Oni/Web/App.php
@@ -10,8 +10,8 @@
 
 namespace Oni\Web;
 
-use Oni\Basic;
-use Oni\Loader;
+use Oni\Core\Basic;
+use Oni\Core\Loader;
 use Oni\Web\Http\Req;
 use Oni\Web\Http\Res;
 use Oni\Web\View;

diff --git a/src/Oni/Web/Controller/Ajax.php b/src/Oni/Web/Controller/Ajax.php
@@ -10,7 +10,7 @@
 
 namespace Oni\Web\Controller;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 use Oni\Web\Http\Req;
 use Oni\Web\Http\Res;
 

diff --git a/src/Oni/Web/Controller/Page.php b/src/Oni/Web/Controller/Page.php
@@ -10,7 +10,7 @@
 
 namespace Oni\Web\Controller;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 use Oni\Web\Http\Req;
 use Oni\Web\Http\Res;
 use Oni\Web\View;

diff --git a/src/Oni/Web/Controller/Rest.php b/src/Oni/Web/Controller/Rest.php
@@ -10,7 +10,7 @@
 
 namespace Oni\Web\Controller;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 use Oni\Web\Http\Req;
 use Oni\Web\Http\Res;
 

diff --git a/src/Oni/Web/Helper/HTML.php b/src/Oni/Web/Helper/HTML.php
@@ -10,7 +10,7 @@
 
 namespace Oni\Web\Helper;
 
-class HTML
+final class HTML
 {
     /**
      * Construct

diff --git a/src/Oni/Web/Model.php b/src/Oni/Web/Model.php
@@ -10,6 +10,6 @@
 
 namespace Oni\Web;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 
 class Model extends Basic {}
diff --git a/src/Oni/Web/Router.php b/src/Oni/Web/Router.php
@@ -10,7 +10,7 @@
 
 namespace Oni\Web;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 
 class Router extends Basic
 {

diff --git a/src/Oni/Web/Store/Cache.php b/src/Oni/Web/Store/Cache.php
@@ -11,7 +11,7 @@
 namespace Oni\Web\Store;
 
 use Memcached;
-use Oni\Basic;
+use Oni\Core\Basic;
 
 class Cache extends Basic
 {

diff --git a/src/Oni/Web/Store/Database.php b/src/Oni/Web/Store/Database.php
@@ -11,7 +11,7 @@
 namespace Oni\Web\Store;
 
 use PDO;
-use Oni\Basic;
+use Oni\Core\Basic;
 
 class Database extends Basic
 {

diff --git a/src/Oni/Web/View.php b/src/Oni/Web/View.php
@@ -10,7 +10,7 @@
 
 namespace Oni\Web;
 
-use Oni\Basic;
+use Oni\Core\Basic;
 use Oni\Web\Helper\HTML;
 
 class View extends Basic