Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	deft.php

composer.json

@@ -1,10 +1,11 @@
 {
     "name": "alexandergw/deft",
-    "type": "project",
+    "type": "deft-kernel",
     "require": {
       "ext-fileinfo": "*",
       "ext-gd": "*",
-      "ext-json": "*"
+      "ext-json": "*",
+      "php": ">=7.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^8.5",

config/deft.php

@@ -2,27 +2,13 @@
 
 /**
  * File: config/deft.php
- * Date: 2020-04-21 21:44:09
  * Auto-generated configuration by the Deft Framework
  */
 
 return array(
-	'capture_hash' => 'b1049d593d520d138adfb69eeb9cde06',
-	'config_format' => 'php',
-	'debug' => 0,
-	'dir_lib' => 'lib',
-	'dir_plugin' => 'plugin',
-	'dir_public' => 'public',
-	'dir_public_asset' => 'asset',
-	'dir_tmp' => 'tmp',
-	'filesystem.type' => 'local',
-	'format' => 'php',
 	'plugins' => array(
-		0 => 'example',
-		1 => 'test'
-	),
-	'secret' => 'E+o;6y9J!.>}tMHr(d#5_vmGVTD3@ZR<hQ,{7f]K^1z8&j0UAkBueqNsPlXg*Ca$c4[%ixw|O2IY=~FbSp)LW?:n-',
-	'token_hash' => '5140c5a01a70e0991836ca1d8805527c',
-	'token_timeout' => 2592000,
-	'url_separator' => '/'
+		'example',
+		'test',
+		'debug'
+	)
 );

config/locale/es-es.php

@@ -30,7 +30,7 @@
 		'locale' => 'es-ES'
 	),
 	array(
-		'Environment settings' => 'La configuración del entorno',
+		'User environment' => 'La configuración del entorno',
 		'Hello' => 'Hola',
 		'Language' => 'Idioma',
 		'Welcome' => 'Bienvenido'

deft.php

@@ -35,7 +35,7 @@
  * Class Deft
  */
 class Deft {
-	const VERSION = '0.7';
+	const VERSION = '0.8';
 
 	const PLUGIN_LOADED = 2;
 	const PLUGIN_EXISTS = 1;
@@ -95,7 +95,7 @@ class Deft {
 	 *
 	 * @param array $args
 	 */
-	static function init ($config) {
+	static function init ($config = []) {
 		if (self::$initialized || !is_array($config)) {
 			return null;
 		}
@@ -966,6 +966,19 @@ public function getArg ($arg = null, $filter = null, $default = NULL, $seperator
 
 		return $return;
 	}
+
+	/**
+	 * @param $key
+	 *
+	 * @return mixed|null
+	 */
+	public function __get($key) {
+		return $this->getArg($key);
+	}
+
+//	public function __set($key, $value) {
+//		return $this->setArg($key, $value);
+//	}
 }
 
 /**
@@ -980,9 +993,9 @@ function __ ( /*polymorphic*/) {
 	$args = func_get_args();
 	$phrase = array_shift($args);
 
-//	if (\Deft::locale()->isDefault() === false) {
-//		$phrase = \Deft::locale()->getPhrase($phrase);
-//	}
+	if (\Deft::locale()->isDefault() === false) {
+		$phrase = \Deft::locale()->getPhrase($phrase);
+	}
 
 	if (count($args)) {
 		$phrase = vsprintf($phrase, $args);

lib/cli.php

@@ -110,10 +110,11 @@ public static function wasRouted() {
 	 * Cache management
 	 */
 	public static function cacheManagement() {
+		$data = \Deft::route()->current()->data ?: [];
 		$actions = [
 			'clear'
 		];
-		$action = \Deft::route()->current()->data['action'];
+		$action = $data['action'];
 
 		if (!in_array($action, $actions))
 			\Deft::log()->error(__('Unknown cache management action "%1$s"', $action));
@@ -124,12 +125,12 @@ public static function cacheManagement() {
 				'all',
 				'public'
 			];
-			$task = \Deft::route()->current()->data['task'];
+			$task = array_key_exists('task', $data) ? $data['task'] : 'all';
 
 			if (!in_array($task, $tasks))
 				return \Deft::log()->error(__('Unknown cache management action "clear" task "%1$s"', $task));
 
-			\Deft::log()->status(__('Started clearing "%1$s" caches', $task));
+			___('Started clearing "%1$s" caches', $task);
 
 			$fs = \Deft::filesystem();
 
@@ -145,6 +146,11 @@ public static function cacheManagement() {
 				self::logLastEventCall('cliCacheClearPublic');
 			}
 
+			if ($task === 'storage' || $task === 'all') {
+				\Deft::event()->exec('cliCacheClearStorage');
+				self::logLastEventCall('cliCacheClearStorage');
+			}
+
 			if ($task === 'all') {
 				\Deft::event()->exec('cliCacheClearAll');
 				self::logLastEventCall('cliCacheClearAll');

lib/fIlesystem.php

@@ -3,6 +3,7 @@
 
 namespace Deft\Lib;
 
+// TODO: Switch to filesystem.local
 
 class Filesystem extends \Deft_Concrete {
 

lib/locale.php

@@ -59,7 +59,7 @@ public static function init () {
 		}
 		if (!$string) {
 			$query = (array)\Deft::route()->current('data');
-			if (array_key_exists('data', $query))
+			if (array_key_exists('locale', $query))
 				$string['locale'];
 		}
 		if (!$string) {
@@ -144,16 +144,15 @@ public static function init () {
 	 */
 	public static function negotiate ($locale = null) {
 		if (is_string($locale) and (strlen($locale) == 2 or strlen($locale) == 5)) {
-			$config     = \Deft::config();
-			$locales = $config->get('locales', array());
+			$locales = \Deft::config()->get('locales', []);
 
-			if (strlen($locale) == 5) {
+			if (strlen($locale) === 5) {
 				if (in_array($locale, $locales)) {
 					return $locale;
 				}
 				$locale = substr($locale, 0, 2);
 			}
-			if (strlen($locale) == 2 and in_array($locale, $locales)) {
+			if (strlen($locale) === 2 and in_array($locale, $locales)) {
 				return $locale;
 			}
 		}

lib/response.php

@@ -39,6 +39,18 @@ class Response extends \Deft_Concrete {
 //		parent::__construct($this->args, $class);
 //	}
 
+	/**
+	 * @param null $buffer
+	 *
+	 * @return string
+	 */
+	public function type($buffer = NULL) {
+		if (is_null($buffer))
+			return $this->getArg('type');
+		$this->setArg('type', $buffer);
+		return TRUE;
+	}
+
 	/**
 	 * @param null $buffer
 	 *

lib/response/http.php

@@ -26,6 +26,8 @@
 use Deft\Lib\Response;
 
 class Http extends Response {
+	protected $cookies = [];
+	protected $headers = [];
 
 	/**
 	 * @param null $uri

package.json

@@ -9,7 +9,8 @@
   "scripts": {
     "up": "php -S localhost:8000 -t ./public",
     "test": "./vendor/bin/phpunit --configuration ./phpunit.xml --verbose",
-    "debug": "./vendor/bin/phpunit --debug --configuration ./phpunit.xml"
+    "debug": "./vendor/bin/phpunit --debug --configuration ./phpunit.xml",
+    "postinstall": "grunt"
   },
   "repository": {
     "type": "git",

plugin/debug/asset/debug.scss

@@ -124,6 +124,8 @@ section.deft-debug {
 			div.detail {
 				display: block;
 				overflow-x: scroll;
+				padding: .75em;
+				font-family: monospace;
 			}
 		}
 

plugin/debug/debug.php

@@ -33,17 +33,26 @@ class Debug extends Plugin {
 	private static $hash;
 
 	public static function init () {
-		\Deft::route()->add('debug', 'debug', null, '\Deft\Plugin\Debug::returnSetting');
-		\Deft::route()->add('debug.request', 'debug/request/[hash]', array(
+		\Deft::route()->http('debug', 'debug', null, '\Deft\Plugin\Debug::returnSetting');
+		\Deft::route()->http('debug.request', 'debug/request/[hash]', array(
 			'hash' => '[0-9a-z]{32}'
 		), '\Deft\Plugin\Debug::returnRequest');
 
 		\Deft::event()->set('ready', '\Deft\Plugin\Debug::setResponseAssets');
+
+		\Deft::event()->set('cliCacheClearStorage', function(){
+			$fs = \Deft::filesystem();
+			if ($fs->exists(DEFT_STORAGE_PATH . DS . 'debug')) {
+				if (!$fs->delete(DEFT_STORAGE_PATH . DS . 'debug', true)) {
+					\Deft::log()->warning(__('Failed to delete debug storage'));
+				}
+			}
+		});
 	}
 
 	public static function setResponseAssets() {
 		$res = \Deft::response();
-		if ($res->getArg('type') === 'http.html') {
+		if ($res->type === 'http.html') {
 			$hash = \Deft\Plugin\Debug::getHash();
 			$res->addScriptContent("var Deft = Deft || {}; Deft.debugHash = '{$hash}';");
 			$res->addScript('plugin/debug/asset/debug.js');
@@ -112,7 +121,7 @@ public static function returnRequest() {
 		// Set response output to JSON
 		\Deft::config()->set('response.type', 'http.json');
 
-		$content = file_get_contents(self::getPath() . DS . \Deft::route()->getParam('hash') . '.json');
+		$content = \Deft::filesystem()->read(self::getPath() . DS . \Deft::route()->getParam('hash') . '.json');
 
 		// Buffer the content
 		\Deft::response()->buffer($content);
@@ -125,9 +134,13 @@ public static function shutdown() {
 	}
 
 	public static function captureWriteJson() {
-		if (!is_dir(self::getPath()))
-			mkdir(self::getPath());
-		file_put_contents(self::getPath() . DS . self::getHash() . '.json', \Deft::capture('plugin.debug.template.json'));
+		$fs = \Deft::filesystem();
+
+		if ($fs->exists(self::getPath()) === false)
+			$fs->install(self::getPath());
+
+		if (!$fs->write(self::getPath() . DS . self::getHash() . '.json', \Deft::capture('plugin.debug.template.json')))
+			\Deft::log()->warning(__('Failed to write debug stack JSON to storage'));
 	}
 }
 

plugin/example/asset/scss/example.scss

@@ -1,5 +1,7 @@
 %font-root {
 	font-size: 12pt;
+	letter-spacing: .075rem;
+	line-height: 1.25;
 }
 
 $background-color: #3a3a3a;
@@ -12,9 +14,7 @@ body {
 	border: none;
 	box-sizing: border-box;
 	font-family: 'Raleway', sans-serif;
-	line-height: 1.25;
 	background-color: $background-color;
-	letter-spacing: .075rem;
 	text-align: initial;
 	@extend %font-root;
 	> main {
@@ -41,10 +41,55 @@ body {
 	}
 }
 
+.pad-l1 {
+	padding-left: 2em;
+}
+
+.grid {
+	font-size: 0;
+	letter-spacing: 0;
+	line-height: 1;
+	> div {
+		display: inline-block;
+		vertical-align: top;
+		@extend %font-root;
+		width: 100%;
+		&.col-9 {
+			width: 75%;
+		}
+		&.col-6 {
+			width: 50%;
+		}
+		&.col-3 {
+			width: 25%;
+		}
+	}
+}
+
+.logo {
+	box-sizing: border-box;
+	display: inline-block;
+	border: .25em solid #fff;
+	padding: 2em 1em 1em;
+	width: 172px;
+	height: 172px;
+	line-height: 1;
+	div:first-child {
+		font-size: 4em;
+	}
+	div:last-child {
+		text-align: center;
+		text-transform: uppercase;
+		font-weight: 700;
+		letter-spacing: .125em;
+		margin-top: 1.25em;
+	}
+}
+
 h1 {
-	margin: 0;
+	margin: 0 0 .5em 0;
 	padding: 0;
-	font-size: 4em;
+	font-size: 2.5em;
 	font-weight: 400;
 }
 
@@ -164,6 +209,8 @@ p {
 	margin: 0;
 	&.cta {
 		background-color: #252525;
+		padding: 1em;
+		margin: 1em 0;
 	}
 }