Upgrade to skeleton-core v4

tigron · Mar 18, 2023 · 30bcb10 · 30bcb10
1 parent 4cb9f9b
commit 30bcb10
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/app/example/module/Index.php b/app/example/module/Index.php
@@ -9,14 +9,12 @@
 
 namespace App\Example\Module;
 
-use \Skeleton\Core\Application\Web\Module;
-use \Skeleton\Core\Web\Session;
-use \Skeleton\Core\Web\Template;
+use Skeleton\Application\Web\Module;
+use Skeleton\Application\Web\Template;
+use Skeleton\Core\Http\Session;
 
 class Index extends Module {
 
-	public $login_required = true;
-
 	/**
 	 * Template
 	 *

diff --git a/composer.json b/composer.json
@@ -6,6 +6,7 @@
     "description": "Tigron Skeleton",
     "type": "project",
     "require": {
+        "tigron/skeleton-application-web": "*",
         "tigron/skeleton-console": "*",
         "tigron/skeleton-core": "*",
         "tigron/skeleton-database": "*",

diff --git a/config/core.php b/config/core.php
@@ -5,10 +5,11 @@
 
 return [
 	// Where skeleton can find various parts of your application
-	'application_dir' => dirname(__FILE__) . '/../app/',
-	'asset_dir' => dirname(__FILE__) . '/../lib/external/assets/',
-	'tmp_dir' => dirname(__FILE__) . '/../tmp/',
-	'lib_dir' => dirname(__FILE__) . '/../lib/',
+	'application_path' => dirname(__FILE__) . '/../app/',
+	'asset_paths' => [
+		dirname(__FILE__) . '/../lib/external/assets/',
+	],
+	'tmp_path' => dirname(__FILE__) . '/../tmp/',
 
 	// Display or hide errors
 	'debug' => true,

diff --git a/lib/base/Bootstrap.php b/lib/base/Bootstrap.php
@@ -66,7 +66,7 @@ public static function boot() {
 		/**
 		 * Initialize the template
 		 */
-		\Skeleton\Template\Twig\Config::$cache_directory = $config->tmp_dir . 'twig/';
+		\Skeleton\Template\Twig\Config::$cache_directory = $config->tmp_path . 'twig/';
 		\Skeleton\Template\Twig\Config::$debug = $config->debug;
 	}
 }
diff --git a/webroot/handler.php b/webroot/handler.php
@@ -10,4 +10,4 @@
 require_once '../lib/base/Bootstrap.php';
 Bootstrap::boot();
 
-\Skeleton\Core\Web\Handler::run();
+\Skeleton\Core\Http\Handler::Run();