Update ubiquity-* Fix React minimum-stability (#4860)

* Moving the pdo connection

* Update composer.json

* update vs swoole

frameworks/PHP/ubiquity/app/config/services.php

@@ -1,3 +1,2 @@
 <?php
 \Ubiquity\cache\CacheManager::startProd($config);
-\Ubiquity\orm\DAO::startDatabase($config);

frameworks/PHP/ubiquity/app/config/services_.php

@@ -1,2 +0,0 @@
-<?php
-\Ubiquity\cache\CacheManager::startProd($config);

frameworks/PHP/ubiquity/app/controllers/Db.php

@@ -14,6 +14,8 @@ class Db extends Controller {
 
 	public function initialize() {
 		UResponse::setContentType('application/json');
+		$config = Startup::getConfig();
+		DAO::startDatabase($config);
 	}
 
 	public function index() {
@@ -34,14 +36,12 @@ class Db extends Controller {
 	public function update($queries = 1) {
 		$worlds = [];
 		$queries = is_numeric($queries) ? min(max($queries, 1), 500) : 1;
-		DAO::beginTransaction();
 		for ($i = 0; $i < $queries; ++ $i) {
 			$world = DAO::getById(World::class, mt_rand(1, 10000), false);
 			$world->setRandomNumber(mt_rand(1, 10000));
 			DAO::update($world);
 			$worlds[] = $world->_rest;
 		}
-		DAO::commit();
 		echo \json_encode($worlds);
 	}
 }

frameworks/PHP/ubiquity/app/controllers/Db_.php

@@ -1,31 +0,0 @@
-<?php
-namespace controllers;
-
-use Ubiquity\controllers\Startup;
-use Ubiquity\utils\http\UResponse;
-use Ubiquity\orm\DAO;
-use models\World;
-
-/**
- * Bench controller.
- */
-class Db_ extends Db {
-
-	public function initialize() {
-		UResponse::setContentType('application/json');
-		$config = Startup::getConfig();
-		DAO::startDatabase($config);
-	}
-
-	public function update($queries = 1) {
-		$worlds = [];
-		$queries = is_numeric($queries) ? min(max($queries, 1), 500) : 1;
-		for ($i = 0; $i < $queries; ++ $i) {
-			$world = DAO::getById(World::class, mt_rand(1, 10000), false);
-			$world->setRandomNumber(mt_rand(1, 10000));
-			DAO::update($world);
-			$worlds[] = $world->_rest;
-		}
-		echo \json_encode($worlds);
-	}
-}

frameworks/PHP/ubiquity/app/controllers/Fortunes.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace controllers;
 
 use Ubiquity\controllers\Controller;
@@ -9,17 +8,22 @@ use Ubiquity\views\engine\micro\MicroTemplateEngine;
 use models\Fortune;
 
 class Fortunes extends Controller {
-	public function initialize(){
-		Startup::$templateEngine=new MicroTemplateEngine();
+
+	public function initialize() {
+		Startup::$templateEngine = new MicroTemplateEngine();
+		$config = Startup::getConfig();
+		DAO::startDatabase($config);
 	}
-	
+
 	public function index() {
-		$fortunes = DAO::getAll(Fortune::class,'',false);
+		$fortunes = DAO::getAll(Fortune::class, '', false);
 		$fortunes[] = (new Fortune())->setId(0)->setMessage('Additional fortune added at request time.');
-		usort($fortunes, function($left, $right) {
-			return $left->message<=>$right->message;
+		usort($fortunes, function ($left, $right) {
+			return $left->message <=> $right->message;
 		});
-		$this->loadView('Fortunes/index.php',['fortunes' => $fortunes]);
+		$this->loadView('Fortunes/index.php', [
+			'fortunes' => $fortunes
+		]);
 	}
 }
 

frameworks/PHP/ubiquity/app/controllers/Fortunes_.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace controllers;
-
-use Ubiquity\controllers\Startup;
-use Ubiquity\views\engine\micro\MicroTemplateEngine;
-
-class Fortunes_ extends Fortunes {
-	public function initialize(){
-		Startup::$templateEngine=new MicroTemplateEngine();
-		$config=Startup::getConfig();
-		\Ubiquity\orm\DAO::startDatabase($config);
-	}
-}
-

frameworks/PHP/ubiquity/benchmark_config.json

@@ -5,10 +5,10 @@
       "default": {
         "json_url": "/Json",
         "plaintext_url": "/Plaintext",
-        "db_url": "/Db_",
-        "update_url": "/Db_/update/",
-        "query_url": "/Db_/query/",
-        "fortune_url": "/Fortunes_",
+        "db_url": "/Db",
+        "update_url": "/Db/update/",
+        "query_url": "/Db/query/",
+        "fortune_url": "/Fortunes",
         "port": 8080,
         "approach": "Realistic",
         "classification": "Fullstack",
@@ -69,7 +69,7 @@
         "database_os": "Linux",
         "display_name": "ubiquity-swoole",
         "notes": "",
-        "versus": "php"
+        "versus": "swoole"
       }
     }
   ]

frameworks/PHP/ubiquity/composer.json

@@ -11,5 +11,7 @@
 		"psr-4" : {
 			"" : "app/"
 		}
-	}
+	},
+	"minimum-stability": "dev",
+	"prefer-stable": true
 }

frameworks/PHP/ubiquity/index.php

@@ -2,8 +2,8 @@
 error_reporting(E_ALL);
 
 define('DS', DIRECTORY_SEPARATOR);
-define('ROOT', __DIR__.DS.'app'.DS);
-$config=include_once ROOT.'config/config.php';
-require_once ROOT.'./../vendor/autoload.php';
-require_once ROOT.'config/services_.php';
+define('ROOT', __DIR__ . DS . 'app' . DS);
+$config = include_once ROOT . 'config/config.php';
+require_once ROOT . './../vendor/autoload.php';
+require_once ROOT . 'config/services.php';
 \Ubiquity\controllers\Startup::run($config);