Merge pull request #90 from svandragt/feature/composer

Composerize
svandragt · Jul 1, 2020 · a130f9e · a130f9e
2 parents 31d8aa4 + 6c0181f
commit a130f9e
Show file tree

Hide file tree

Showing 51 changed files with 14 additions and 907 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,8 @@
 {
     "name": "svandragt/cuttlefish",
     "description": "Hackable web framework.",
-    "type": "project",
+    "type": "library",
+    "version": "0.4.2",
     "license": "MIT",
     "authors": [
         {
@@ -19,8 +20,7 @@
     },
     "autoload": {
         "psr-4": {
-            "": "src/application/",
-            "Cuttlefish\\": "src/system/"
+            "Cuttlefish\\": "src"
         }
     },
     "config": {
@@ -45,4 +45,4 @@
             "phpcs"
         ]
     }
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/src/system/App.php → src/App.php b/src/system/App.php → src/App.php
@@ -7,9 +7,11 @@ class App
     public $Security;
     public $Cache;
     public $Environment;
+    public $app_namespace;
 
-    public function __construct()
+    public function __construct($app_namespace = '')
     {
+        $this->app_namespace = $app_namespace;
         $this->Cache = new Cache();
         if ($this->Cache->hasExistingCachefile()) {
              $bytes = readfile($this->Cache->convertUrlpathToFilepath());
@@ -32,7 +34,7 @@ public function run()
 
         // Process request if not statically cached.
         $this->Cache->start();
-        new Request();
+        new Request($this->app_namespace);
         $this->Cache->end();
     }
 }
diff --git a/src/system/Cache.php → src/Cache.php b/src/system/Cache.php → src/Cache.php
diff --git a/src/Configuration.php.dist b/src/Configuration.php.dist
diff --git a/src/system/Controller.php → src/Controller.php b/src/system/Controller.php → src/Controller.php
diff --git a/src/system/Curl.php → src/Curl.php b/src/system/Curl.php → src/Curl.php
diff --git a/src/system/Defaults.php → src/Defaults.php b/src/system/Defaults.php → src/Defaults.php
@@ -18,7 +18,7 @@ class Defaults
     public const HOME_PAGE = '/home';
     public const APPLICATION_FOLDER = 'application';
     public const CACHE_FOLDER = '../_cache';
-    public const CONTENT_FOLDER = 'content';
+    public const CONTENT_FOLDER = '../content';
     public const LOGS_FOLDER = '../_logs';
     public const THEMES_FOLDER = 'themes';
 }
diff --git a/src/system/Environment.php → src/Environment.php b/src/system/Environment.php → src/Environment.php
diff --git a/src/system/Feed.php → src/Feed.php b/src/system/Feed.php → src/Feed.php
diff --git a/src/system/File.php → src/File.php b/src/system/File.php → src/File.php
diff --git a/src/system/Files.php → src/Files.php b/src/system/Files.php → src/Files.php
diff --git a/src/system/Filesystem.php → src/Filesystem.php b/src/system/Filesystem.php → src/Filesystem.php
diff --git a/src/system/Html.php → src/Html.php b/src/system/Html.php → src/Html.php
diff --git a/src/system/Http.php → src/Http.php b/src/system/Http.php → src/Http.php
diff --git a/src/system/Log.php → src/Log.php b/src/system/Log.php → src/Log.php
diff --git a/src/system/MetadataReader.php → src/MetadataReader.php b/src/system/MetadataReader.php → src/MetadataReader.php
diff --git a/src/system/Model.php → src/Model.php b/src/system/Model.php → src/Model.php
diff --git a/src/system/Request.php → src/Request.php b/src/system/Request.php → src/Request.php
@@ -15,12 +15,15 @@ class Request
 {
     protected $Controller;
 
-    public function __construct()
+    public function __construct($app_namespace)
     {
 
         // Route to controller
         $args                 = explode("/", $this->pathInfo());
         $controller_class     = 'Controller' . ucfirst($args[1]);
+        if (!empty($app_namespace)) {
+            $controller_class = $app_namespace . '\\' . $controller_class;
+        }
         $controller_arguments = array_slice($args, 2);
         if (class_exists($controller_class, true)) {
             $this->Controller = new $controller_class($this, $controller_arguments);

diff --git a/src/system/Security.php → src/Security.php b/src/system/Security.php → src/Security.php
diff --git a/src/system/Template.php → src/Template.php b/src/system/Template.php → src/Template.php
diff --git a/src/system/Url.php → src/Url.php b/src/system/Url.php → src/Url.php
diff --git a/src/application/ControllerAdmin.php b/src/application/ControllerAdmin.php
diff --git a/src/application/ControllerArchive.php b/src/application/ControllerArchive.php
diff --git a/src/application/ControllerErrors.php b/src/application/ControllerErrors.php
diff --git a/src/application/ControllerFeeds.php b/src/application/ControllerFeeds.php
diff --git a/src/application/ControllerHome.php b/src/application/ControllerHome.php
diff --git a/src/application/ControllerImages.php b/src/application/ControllerImages.php