Merge pull request #24 from phpMv/update-to-ubiquity-2.5.0

Update to ubiquity 2.5.0

Author: jcheron

src/Ubiquity

@@ -47,7 +47,7 @@ class Ubiquity {
 
 	use CmdTrait;
 
-	private static $version = '1.3.11';
+	private static $version = '1.4.0';
 
 	private static $appName = 'Ubiquity devtools';
 
@@ -761,9 +761,9 @@ class Ubiquity {
 				$config = self::_init(true);
 				if (\is_array($config)) {
 					if (\class_exists("\\Ubiquity\\controllers\\admin\\UbiquityMyAdminBaseController")) {
-						$v .= 'Ubiquity webtools (' . \Ubiquity\controllers\admin\UbiquityMyAdminBaseController::version . ")\n";
+						$v .= 'Ubiquity webtools (' . \Ubiquity\controllers\admin\UbiquityMyAdminBaseController::VERSION . ")\n";
 					}
-					$v .= 'Ubiquity ' . Framework::version . "\n";
+					$v .= 'Ubiquity ' . Framework::getVersion() . "\n";
 				}
 				$v .= 'OS: ' . \php_uname() . "\n";
 				echo ConsoleFormatter::showInfo($v);
@@ -798,7 +798,7 @@ class Ubiquity {
 				break;
 
 			case 'config_set':
-				$config = self::_init();
+				$config = self::_init(false,true);
 				ConfigSetCmd::run($config, $options);
 				break;
 
@@ -1062,7 +1062,7 @@ class Ubiquity {
 		}
 	}
 
-	private static function _init($silent = false) {
+	private static function _init($silent = false,$noEval=false) {
 		self::$activeDir = dirname(__FILE__);
 		if (! self::setDir(getcwd())) {
 			if ($silent) {
@@ -1080,8 +1080,11 @@ class Ubiquity {
 		if (isset(\Ubiquity\controllers\Startup::$config)) {
 			$config = \Ubiquity\controllers\Startup::$config;
 		} else {
-			$config = require_once 'app/config/config.php';
+			$config = require_once 'app/cache/config/config.cache.php';
 			\Ubiquity\controllers\Startup::setConfig($config);
+			if($noEval){
+			    $config=\Ubiquity\config\ConfigCache::loadConfigWithoutEval();
+            }
 		}
 		return $config;
 	}

src/devtools/core/toolsConfig.php

@@ -1,14 +1,14 @@
 <?php
 return [
 	"cdn" => [
-		"jquery" => "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js",
+		"jquery" => "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.2/jquery.min.js",
 		"bootstrap" => [
 			"css" => "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/css/bootstrap.min.css",
 			"js" => "https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.4.1/js/bootstrap.min.js"
 		],
 		"semantic" => [
-			"css" => "https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.8/dist/semantic.min.css",
-			"js" => "https://cdn.jsdelivr.net/npm/fomantic-ui@2.8.8/dist/semantic.min.js"
+			"css" => "https://cdn.jsdelivr.net/npm/fomantic-ui@2.9.0/dist/semantic.min.css",
+			"js" => "https://cdn.jsdelivr.net/npm/fomantic-ui@2.9.0/dist/semantic.min.js"
 		],
 		"diff2html" => [
 			"css" => "https://cdnjs.cloudflare.com/ajax/libs/diff2html/2.12.2/diff2html.min.css"

src/devtools/project-files/app/views/themes/semantic/main/vFooter.html

@@ -1,9 +1,8 @@
 {% block footer %}
 {% endblock %}
 {% block scripts %}
-<script nonce="{{nonce}}" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-<script nonce="{{nonce}}" src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js"></script>
-<script nonce="{{nonce}}" src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.3.0/components/state.min.js"></script>
+<script nonce="{{nonce}}" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
+<script nonce="{{nonce}}" src="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.js"></script>
 {{script_foot | raw }}
 {% endblock %}
 </body>

src/devtools/project-files/app/views/themes/semantic/main/vHeader.html

@@ -7,7 +7,7 @@
 	<title>ubi-projects semantic-UI</title>
 {% endblock %}
 {% block css %}
-	<link nonce="{{nonce}}" rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.css">
+	<link nonce="{{nonce}}" rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/fomantic-ui@2.9.0/dist/semantic.min.css">
 	{{css('@activeTheme/css/style.css',{nonce:nonce}) | raw}}
 {% endblock %}
 </head>

src/devtools/project-files/index.php

@@ -1,7 +1,7 @@
 <?php
 define('DS', DIRECTORY_SEPARATOR);
 define('ROOT', __DIR__ . DS . '..' . DS . 'app' . DS);
-$config = include ROOT . 'config/config.php';
+$config = include ROOT . 'cache/config/config.cache.php';
 require ROOT . './../vendor/autoload.php';
 require ROOT . 'config/services.php';
 \Ubiquity\controllers\Startup::run($config);