refactor: switch to psr-4 autoloading

42 files changed, 149 insertions, 48 deletions

diff --git a/app/class/application.php b/app/class/Application.php
index 784a388..70c899f 100644
--- a/app/class/application.php
+++ b/app/class/Application.php
@@ -1,4 +1,5 @@
 <?php
+namespace Wcms;
 
 class Application
 {
diff --git a/app/class/config.php b/app/class/Config.php
index 3d67908..1a4bb17 100644
--- a/app/class/config.php
+++ b/app/class/Config.php
@@ -1,6 +1,7 @@
 <?php
 
 
+namespace Wcms;
 
 abstract class Config
 {
diff --git a/app/class/controller.php b/app/class/Controller.php
index a5bd33b..32ffc13 100644
--- a/app/class/controller.php
+++ b/app/class/Controller.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace Wcms;
+
+use DateTimeImmutable;
+use League\Plates\Engine;
+
 class Controller
 {
     /** @var User */
@@ -36,7 +41,7 @@ class Controller
     public function initplates()
     {
         $router = $this->router;
-        $this->plates = new League\Plates\Engine(Model::TEMPLATES_DIR);
+        $this->plates = new Engine(Model::TEMPLATES_DIR);
         $this->plates->registerFunction('url', function (string $string, array $vars = []) use ($router) {
             return $router->generate($string, $vars);
         });
diff --git a/app/class/controlleradmin.php b/app/class/Controlleradmin.php
index dda0a54..3935bff 100644
--- a/app/class/controlleradmin.php
+++ b/app/class/Controlleradmin.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controlleradmin extends Controller
 {
 
diff --git a/app/class/controllerconnect.php b/app/class/Controllerconnect.php
index 1bd0a5a..592c0ee 100644
--- a/app/class/controllerconnect.php
+++ b/app/class/Controllerconnect.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controllerconnect extends Controller
 {
 
diff --git a/app/class/controllerfont.php b/app/class/Controllerfont.php
index 8f87e3a..63b3ced 100644
--- a/app/class/controllerfont.php
+++ b/app/class/Controllerfont.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controllerfont extends Controller
 {
     /**
diff --git a/app/class/controllerhome.php b/app/class/Controllerhome.php
index d263611..003a325 100644
--- a/app/class/controllerhome.php
+++ b/app/class/Controllerhome.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controllerhome extends Controllerpage
 {
     /** @var Modelhome */
diff --git a/app/class/controllerinfo.php b/app/class/Controllerinfo.php
index 82d247d..af81caf 100644
--- a/app/class/controllerinfo.php
+++ b/app/class/Controllerinfo.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controllerinfo extends Controller
 {
 
diff --git a/app/class/controllermedia.php b/app/class/Controllermedia.php
index 6cde0ce..f596550 100644
--- a/app/class/controllermedia.php
+++ b/app/class/Controllermedia.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controllermedia extends Controller
 {
     /**
diff --git a/app/class/controllerpage.php b/app/class/Controllerpage.php
index 86aecba..5ab2928 100644
--- a/app/class/controllerpage.php
+++ b/app/class/Controllerpage.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace Wcms;
+
+use DateTimeImmutable;
+use DateTimeZone;
+
 class Controllerpage extends Controller
 {
     /** @var Page */
diff --git a/app/class/controllertimeline.php b/app/class/Controllertimeline.php
index 7e617e1..8fc40d2 100644
--- a/app/class/controllertimeline.php
+++ b/app/class/Controllertimeline.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controllertimeline extends Controller
 {
     /**
diff --git a/app/class/controlleruser.php b/app/class/Controlleruser.php
index d56d999..3856914 100644
--- a/app/class/controlleruser.php
+++ b/app/class/Controlleruser.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Controlleruser extends Controller
 {
 
diff --git a/app/class/dbitem.php b/app/class/Dbitem.php
index 2035316..fb272b1 100644
--- a/app/class/dbitem.php
+++ b/app/class/Dbitem.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Dbitem
 {
     public function hydrate($datas)
diff --git a/app/class/element.php b/app/class/Element.php
index 113daad..09f4e35 100644
--- a/app/class/element.php
+++ b/app/class/Element.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Element
 {
     protected $fullmatch;
diff --git a/app/class/event.php b/app/class/Event.php
index ddf177b..8c1e155 100644
--- a/app/class/event.php
+++ b/app/class/Event.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace Wcms;
+
+use DateTime;
+use DateTimeImmutable;
+use DateTimeZone;
+
 class Event extends Dbitem
 {
     protected $id;
diff --git a/app/class/wflywheel/formatter/json.php b/app/class/Flywheel/Formatter/JSON.php
index d015cc1..9659fcb 100644
--- a/app/class/wflywheel/formatter/json.php
+++ b/app/class/Flywheel/Formatter/JSON.php
@@ -1,5 +1,5 @@
 <?php
-namespace WFlywheel\Formatter;
+namespace Wcms\Flywheel\Formatter;
 
 class JSON implements \JamesMoss\Flywheel\Formatter\FormatInterface
 {
diff --git a/app/class/wflywheel/predicate.php b/app/class/Flywheel/Predicate.php
index 2229461..2922c8d 100644
--- a/app/class/wflywheel/predicate.php
+++ b/app/class/Flywheel/Predicate.php
@@ -1,5 +1,5 @@
 <?php
-namespace WFlywheel;
+namespace Wcms\Flywheel;
 
 class Predicate extends \JamesMoss\Flywheel\Predicate
 {
diff --git a/app/class/wflywheel/query.php b/app/class/Flywheel/Query.php
index 49aff16..f002080 100644
--- a/app/class/wflywheel/query.php
+++ b/app/class/Flywheel/Query.php
@@ -1,5 +1,5 @@
 <?php
-namespace WFlywheel;
+namespace Wcms\Flywheel;
 
 class Query extends \JamesMoss\Flywheel\Query
 {
diff --git a/app/class/wflywheel/repository.php b/app/class/Flywheel/Repository.php
index baad42e..d0b68eb 100644
--- a/app/class/wflywheel/repository.php
+++ b/app/class/Flywheel/Repository.php
@@ -1,5 +1,5 @@
 <?php
-namespace WFlywheel;
+namespace Wcms\Flywheel;
 
 class Repository extends \JamesMoss\Flywheel\Repository
 {
diff --git a/app/class/media.php b/app/class/Media.php
index d458a33..b30b883 100644
--- a/app/class/media.php
+++ b/app/class/Media.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Media
 {
 	private $id;
diff --git a/app/class/medialist.php b/app/class/Medialist.php
index 156ee2e..da5ba4f 100644
--- a/app/class/medialist.php
+++ b/app/class/Medialist.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Medialist
 {
     /** @var string full regex match */
diff --git a/app/class/model.php b/app/class/Model.php
index 45ac2d1..81ad626 100644
--- a/app/class/model.php
+++ b/app/class/Model.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Wcms;
+
 abstract class Model
 {
 
diff --git a/app/class/modelanalyse.php b/app/class/Modelanalyse.php
index 66a443e..9f656f5 100644
--- a/app/class/modelanalyse.php
+++ b/app/class/Modelanalyse.php
@@ -1,6 +1,6 @@
 <?php
 
-
+namespace Wcms;
 
 class Modelanalyse extends Modelpage
 {
diff --git a/app/class/modelconfig.php b/app/class/Modelconfig.php
index 7c5fc18..518f64e 100644
--- a/app/class/modelconfig.php
+++ b/app/class/Modelconfig.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 abstract class Modelconfig extends Model
 {
     public static function readconfig()
diff --git a/app/class/Modeldb.php b/app/class/Modeldb.php
new file mode 100644
index 0000000..756fd81
--- /dev/null
+++ b/app/class/Modeldb.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Wcms;
+
+use JamesMoss\Flywheel\Config;
+use Wcms\Flywheel\Formatter\JSON;
+use Wcms\Flywheel\Query;
+use Wcms\Flywheel\Repository;
+
+class Modeldb extends Model
+{
+	protected $database;
+	/** @var Repository */
+	protected $repo;
+
+
+	public function __construct()
+	{
+		$this->dbinit();
+	}
+
+
+	public function dbinit()
+	{
+		$this->database = new Config(Model::DATABASE_DIR, [
+			'query_class' => Query::class,
+			'formatter' => new JSON,
+		]);
+	}
+
+	public function storeinit(string $repo)
+	{
+		$this->repo = new Repository($repo, $this->database);
+	}
+
+	public function list()
+	{
+		return $this->repo->getAllIds();
+	}
+
+
+
+
+
+}
diff --git a/app/class/modelfont.php b/app/class/Modelfont.php
index 8e7645e..3f25e21 100644
--- a/app/class/modelfont.php
+++ b/app/class/Modelfont.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Modelfont extends Model
 {
 
diff --git a/app/class/modelhome.php b/app/class/Modelhome.php
index d90a3d3..f12f7d3 100644
--- a/app/class/modelhome.php
+++ b/app/class/Modelhome.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Modelhome extends Modelpage
 {
  	
diff --git a/app/class/modelmassedit.php b/app/class/Modelmassedit.php
index e69de29..e69de29 100644
--- a/app/class/modelmassedit.php
+++ b/app/class/Modelmassedit.php
diff --git a/app/class/modelmedia.php b/app/class/Modelmedia.php
index 8cd0224..6ac647f 100644
--- a/app/class/modelmedia.php
+++ b/app/class/Modelmedia.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Modelmedia extends Model
 {
 
diff --git a/app/class/modelpage.php b/app/class/Modelpage.php
index 68ccf23..58bd5d3 100644
--- a/app/class/modelpage.php
+++ b/app/class/Modelpage.php
@@ -1,4 +1,9 @@
 <?php
+
+namespace Wcms;
+
+use JamesMoss\Flywheel\Document;
+
 class Modelpage extends Modeldb
 {
 
@@ -60,7 +65,7 @@ class Modelpage extends Modeldb
 	public function add(Page $page)
 	{
 
-		$pagedata = new \JamesMoss\Flywheel\Document($page->dry());
+		$pagedata = new Document($page->dry());
 		$pagedata->setId($page->id());
 		$this->repo->store($pagedata);
 	}
@@ -148,7 +153,7 @@ class Modelpage extends Modeldb
 
 	public function update(Page $page)
 	{
-		$pagedata = new \JamesMoss\Flywheel\Document($page->dry());
+		$pagedata = new Document($page->dry());
 		$pagedata->setId($page->id());
 		$this->repo->store($pagedata);
 	}
diff --git a/app/class/modelrender.php b/app/class/Modelrender.php
index 237d9b5..9f668d4 100644
--- a/app/class/modelrender.php
+++ b/app/class/Modelrender.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Modelrender extends Modelpage
 {
 	protected $router;
diff --git a/app/class/modeltimeline.php b/app/class/Modeltimeline.php
index fa4f709..248e0f6 100644
--- a/app/class/modeltimeline.php
+++ b/app/class/Modeltimeline.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Wcms;
+
+use JamesMoss\Flywheel\Document;
+
 class Modeltimeline extends Modeldb
 {
 	const EVENT_BASE = ['message'];
@@ -64,7 +68,7 @@ class Modeltimeline extends Modeldb
 	 */
 	public function add(Event $event) : bool
 	{
-		$eventdata = new \JamesMoss\Flywheel\Document($event->dry());
+		$eventdata = new Document($event->dry());
 		$eventdata->setId($event->id());
 		$result = $this->repo->store($eventdata);
 		return $result;
diff --git a/app/class/modeluser.php b/app/class/Modeluser.php
index 893a608..c921b4c 100644
--- a/app/class/modeluser.php
+++ b/app/class/Modeluser.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Wcms;
+
+use JamesMoss\Flywheel\Document;
+
 class Modeluser extends Modeldb
 {
     const ADMIN = 10;
@@ -148,7 +152,7 @@ class Modeluser extends Modeldb
      */
     public function add(User $user) : bool
     {
-        $userdata = new \JamesMoss\Flywheel\Document($user->dry());
+        $userdata = new Document($user->dry());
         $userdata->setId($user->id());
         return $this->repo->store($userdata);
     }
diff --git a/app/class/opt.php b/app/class/Opt.php
index bf732c5..803edce 100644
--- a/app/class/opt.php
+++ b/app/class/Opt.php
@@ -1,4 +1,7 @@
 <?php
+
+namespace Wcms;
+
 class Opt
 {
 	protected $sortby = 'id';
diff --git a/app/class/optlist.php b/app/class/Optlist.php
index e21e421..d6a9cdb 100644
--- a/app/class/optlist.php
+++ b/app/class/Optlist.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Optlist extends Opt
 {
     protected $title = 1;
diff --git a/app/class/page.php b/app/class/Page.php
index a55e7cb..2fa4060 100644
--- a/app/class/page.php
+++ b/app/class/Page.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace Wcms;
+
+use DateTime;
+use DateTimeImmutable;
+use DateTimeZone;
+
 class Page
 {
 	protected $id;
diff --git a/app/class/quickcss.php b/app/class/Quickcss.php
index dc7dbac..0173763 100644
--- a/app/class/quickcss.php
+++ b/app/class/Quickcss.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Quickcss
 {
 
diff --git a/app/class/record.php b/app/class/Record.php
index e488383..381f10a 100644
--- a/app/class/record.php
+++ b/app/class/Record.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Record
 {
 	private $id;
diff --git a/app/class/route.php b/app/class/Route.php
index 8e58945..4f2a6de 100644
--- a/app/class/route.php
+++ b/app/class/Route.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Wcms;
+
 class Route
 {
     protected $id = null;
diff --git a/app/class/routes.php b/app/class/Routes.php
index 44f30bd..a803bd6 100644
--- a/app/class/routes.php
+++ b/app/class/Routes.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace Wcms;
+
+use AltoRouter;
 
 class Routes
 {
@@ -59,7 +62,7 @@ class Routes
         $match = $router->match();
         if ($match) {
             $callableParts = explode('#', $match['target']);
-            $controllerName = $callableParts[0];
+            $controllerName = '\\Wcms\\' . $callableParts[0];
             $methodName = $callableParts[1];
 
             $controller = new $controllerName($router);
diff --git a/app/class/user.php b/app/class/User.php
index 3f9c19a..8712c72 100644
--- a/app/class/user.php
+++ b/app/class/User.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace Wcms;
+
+use DateTimeImmutable;
+use DateTimeZone;
+
 class User
 {
     protected $id;
diff --git a/app/class/modeldb.php b/app/class/modeldb.php
deleted file mode 100644
index ef1d351..0000000
--- a/app/class/modeldb.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-class Modeldb extends Model
-{
-	protected $database;
-	/** @var \WFlywheel\Repository */
-	protected $repo;
-
-
-	public function __construct()
-	{
-		$this->dbinit();
-	}
-
-
-	public function dbinit()
-	{
-		$this->database = new \JamesMoss\Flywheel\Config(Model::DATABASE_DIR, [
-			'query_class' => "\WFlywheel\Query",
-			'formatter' => new \WFlywheel\Formatter\JSON,
-		]);
-	}
-
-	public function storeinit(string $repo)
-	{
-		$this->repo = new \WFlywheel\Repository($repo, $this->database);
-	}
-
-	public function list()
-	{
-		return $this->repo->getAllIds();
-	}
-
-
-
-
-
-}