Merge branch 'new' into development

# Conflicts: # composer.json
aplus-framework · Jan 23, 2024 · 972e34d · 972e34d
2 parents aed172e + b5aa559
commit 972e34d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -68,7 +68,7 @@
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpmd/phpmd": "^2.13",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "10.1.3"
+        "phpunit/phpunit": "^10.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
          bootstrap="vendor/autoload.php" colors="true" stopOnError="false" stopOnFailure="false"
          stopOnIncomplete="false" stopOnSkipped="false"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          cacheDirectory=".phpunit.cache">
     <coverage>
         <report>

diff --git a/tests/AppTest.php b/tests/AppTest.php
@@ -46,6 +46,7 @@ final class AppTest extends TestCase
     protected function setUp() : void
     {
         $this->app = new App(new Config(__DIR__ . '/configs', [], '.config.php'));
+        \restore_error_handler();
     }
 
     public function testInitialization() : void

diff --git a/tests/Debug/AppCollectorTest.php b/tests/Debug/AppCollectorTest.php
@@ -35,6 +35,7 @@ protected function setUp() : void
         $this->collector = $this->app::debugger()
             ->getCollection('App')
             ->getCollectors()[0];
+        \restore_error_handler();
     }
 
     protected function getExternalCollector() : AppCollector