From 029511f0cd163ca2b0478aece3d5853e1e4f639d Mon Sep 17 00:00:00 2001 From: Abel Hoogeveen Date: Mon, 29 Nov 2021 22:58:24 +0100 Subject: [PATCH] Updated to latest FuzeWorks libraries. --- composer.json | 16 ++++------ test/autoload.php | 14 +++------ test/bootstrap.php | 5 +-- test/database/DatabaseTest.php | 2 +- test/database/DatabaseTestAbstract.php | 13 ++++++-- test/phpunit.xml | 43 +++++++++----------------- 6 files changed, 36 insertions(+), 57 deletions(-) diff --git a/composer.json b/composer.json index 44d4881..24c05d7 100644 --- a/composer.json +++ b/composer.json @@ -1,27 +1,23 @@ { "name": "fuzeworks/database", "description": "FuzeWorks Framework Database Component", - "homepage": "https://techfuze.net/fuzeworks", + "homepage": "https://i15.nl/fuzeworks", "license": ["MIT"], "authors": [ { - "name": "TechFuze", - "homepage": "https://techfuze.net" - }, - { - "name": "FuzeWorks Community", - "homepage": "https://techfuze.net/fuzeworks/contributors" + "name": "Abel Hoogeveen", + "homepage": "https://i15.nl" } ], "require": { "php": ">=7.4.0", - "fuzeworks/core": "~1.2.6", - "fuzeworks/mvcr": "~1.3.1", + "fuzeworks/core": "~1.3.0", + "fuzeworks/mvcr": "~1.3.0", "ext-pdo": "*" }, "require-dev": { "phpunit/phpunit": "^9", - "fuzeworks/tracycomponent": "~1.2.0" + "fuzeworks/tracycomponent": "~1.3.0" }, "autoload": { "psr-4": { diff --git a/test/autoload.php b/test/autoload.php index 3bd41d5..6e778f5 100644 --- a/test/autoload.php +++ b/test/autoload.php @@ -31,7 +31,7 @@ * @link http://techfuze.net/fuzeworks * @since Version 1.1.4 * - * @version Version 1.1.4 + * @version Version 1.3.0 */ use FuzeWorks\Logger; @@ -41,18 +41,11 @@ chdir(dirname(__DIR__)); // Load the FuzeWorks container $container = require('bootstrap.php'); +Logger::disableHandlers(); // Load the test abstract require_once 'database/DatabaseTestAbstract.php'; -// Reset error and exception handlers -ob_start(); -restore_error_handler(); -restore_exception_handler(); - -// Set logger template for output in CLI -Logger::setLoggerTemplate('logger_cli'); - // Display all errors ini_set('display_errors', 1); error_reporting(E_ALL | E_STRICT); @@ -60,4 +53,5 @@ error_reporting(E_ALL | E_STRICT); // Set localhost "remote" IP isset($_SERVER['REMOTE_ADDR']) OR $_SERVER['REMOTE_ADDR'] = '127.0.0.1'; - +// Set logger template for output in CLI +Logger::setLoggerTemplate('logger_cli'); \ No newline at end of file diff --git a/test/bootstrap.php b/test/bootstrap.php index fc7a619..50570c1 100644 --- a/test/bootstrap.php +++ b/test/bootstrap.php @@ -54,8 +54,5 @@ $configurator->addComponent(new DatabaseComponent()); $configurator->addComponent(new TracyComponent()); // Create container -$container = $configurator->createContainer(); - -// And return the result -return $container; +return $configurator->createContainer(); diff --git a/test/database/DatabaseTest.php b/test/database/DatabaseTest.php index 9a51db8..a8da263 100644 --- a/test/database/DatabaseTest.php +++ b/test/database/DatabaseTest.php @@ -51,7 +51,7 @@ class DatabaseTest extends DatabaseTestAbstract */ protected $database; - public function setUp() + public function setUp(): void { $this->database = Factory::getInstance()->database; } diff --git a/test/database/DatabaseTestAbstract.php b/test/database/DatabaseTestAbstract.php index 9fbd26b..47e4203 100644 --- a/test/database/DatabaseTestAbstract.php +++ b/test/database/DatabaseTestAbstract.php @@ -34,6 +34,7 @@ * @version Version 1.1.4 */ +use FuzeWorks\Config; use PHPUnit\Framework\TestCase; use FuzeWorks\Events; use FuzeWorks\Factory; @@ -51,15 +52,21 @@ abstract class DatabaseTestAbstract extends TestCase * * Reset the layout manager */ - public function tearDown() + public function tearDown(): void { // Clear all events created by tests - Events::$listeners = array(); + Events::$listeners = []; // Reset all config files - Factory::getInstance()->config->discardConfigFiles(); + Factory::getInstance('config')->discardConfigFiles(); // Re-enable events, in case they have been disabled Events::enable(); + + // Remove Config overrides + Config::$configOverrides = []; + + // Remove autoloader + Core::clearAutoloader(); } } diff --git a/test/phpunit.xml b/test/phpunit.xml index 9092ca6..d37cfe4 100644 --- a/test/phpunit.xml +++ b/test/phpunit.xml @@ -1,34 +1,19 @@ - - + + + + + ../ + + + ../vendor/ + ../test/ + ../src/Layout/ + ../src/Config/ + + - + ./ - - - - - - - - - - - ../ - - ../vendor/ - ../tests/ - - - \ No newline at end of file