Rename AtkPhpunit NS and zero memory leaks testing

.github/workflows/test-unit.yml

@@ -117,7 +117,7 @@ jobs:
           if [ "${{ matrix.type }}" != "StaticAnalysis" ]; then composer remove --no-interaction --no-update phpstan/phpstan --dev ; fi
           composer update --ansi --prefer-dist --no-interaction --no-progress --optimize-autoloader
           if [ "${{ matrix.type }}" == "Phpunit Lowest" ]; then composer update  --ansi --prefer-dist --prefer-lowest --prefer-stable --no-interaction --no-progress --optimize-autoloader ; fi
-          if [ "${{ matrix.type }}" == "Phpunit Burn" ]; then sed -i 's/ *public function runBare(): void/public function runBare(): void { gc_collect_cycles(); $mem0 = memory_get_usage(); for ($i = 0; $i < '"$(if [ \"$GITHUB_EVENT_NAME\" == \"schedule\" ]; then echo 5000; else echo 500; fi)"'; ++$i) { $this->_runBare(); if ($i === 0) { gc_collect_cycles(); $mem1 = memory_get_usage(); } } gc_collect_cycles(); $mem2 = memory_get_usage(); if ($mem2 - 1536 * 1024 > $mem0 || $mem2 - 128 * 1024 > $mem1) { $this->onNotSuccessfulTest(new AssertionFailedError("Memory leak detected! (" . round($mem0 \/ (1024 * 1024), 3) . " + " . round(($mem1 - $mem0) \/ (1024 * 1024), 3) . " + " . round(($mem2 - $mem1) \/ (1024 * 1024), 3) . " MB, " . $i . " iterations)")); } } private function _runBare(): void/' vendor/phpunit/phpunit/src/Framework/TestCase.php && cat vendor/phpunit/phpunit/src/Framework/TestCase.php | grep '_runBare(' ; fi
+          if [ "${{ matrix.type }}" == "Phpunit Burn" ]; then sed -i 's/ *public function runBare(): void/public function runBare(): void { gc_collect_cycles(); gc_collect_cycles(); $mem0 = memory_get_usage(); for ($i = 0; $i < '"$(if [ \"$GITHUB_EVENT_NAME\" == \"schedule\" ]; then echo 5000; else echo 500; fi)"'; ++$i) { $this->_runBare(); gc_collect_cycles(); gc_collect_cycles(); if ($i === 0) { $mem1 = memory_get_usage(); } } $mem2 = memory_get_usage(); if ($mem2 - 1536 * 1024 > $mem0 || $mem2 > $mem1) { $this->onNotSuccessfulTest(new AssertionFailedError("Memory leak detected! (" . round($mem0 \/ (1024 * 1024), 3) . " MB + " . round(($mem1 - $mem0) \/ (1024 * 1024), 3) . " MB + " . round(($mem2 - $mem1) \/ 1024, 3) . " KB, " . $i . " iterations)")); } } private function _runBare(): void/' vendor/phpunit/phpunit/src/Framework/TestCase.php && cat vendor/phpunit/phpunit/src/Framework/TestCase.php | grep '_runBare(' ; fi
 
       - name: Init
         run: |

phpunit.xml.dist

@@ -18,9 +18,8 @@
             <directory suffix=".php">src</directory>
         </include>
         <exclude>
-            <file>src/AtkPhpunit/ResultPrinter.php</file>
-            <file>src/AtkPhpunit/ExceptionWrapper.php</file>
-            <file>src/AtkPhpunit/TestCase.php</file>
+            <file>src/Phpunit/ResultPrinter.php</file>
+            <file>src/Phpunit/TestCase.php</file>
         </exclude>
         <report>
             <clover outputFile="build/logs/clover.xml" />

src/AppScopeTrait.php

@@ -61,7 +61,7 @@ trait AppScopeTrait
     protected function assertInstanceOfApp(object $app): void
     {
         // called from phpunit, allow to use/test this trait without \Atk4\Ui\App class
-        if (class_exists(\PHPUnit\Framework\TestCase::class, false)) {
+        if (class_exists(\PHPUnit\Framework\TestCase::class, false) && !class_exists(\Atk4\Ui\App::class)) {
             return;
         }
 

src/AtkPhpunit/ResultPrinter.php → src/Phpunit/ResultPrinter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Atk4\Core\AtkPhpunit;
+namespace Atk4\Core\Phpunit;
 
 use Atk4\Core\Exception;
 use PHPUnit\Framework\ExceptionWrapper;

src/AtkPhpunit/TestCase.php → src/Phpunit/TestCase.php

@@ -2,13 +2,28 @@
 
 declare(strict_types=1);
 
-namespace Atk4\Core\AtkPhpunit;
+namespace Atk4\Core\Phpunit;
 
 /**
  * Generic TestCase for PHPUnit tests for ATK4 repos.
  */
 class TestCase extends \PHPUnit\Framework\TestCase
 {
+    protected function tearDown(): void
+    {
+        // remove once https://github.com/sebastianbergmann/phpunit/issues/4705 is fixed
+        foreach (array_keys(array_diff_key(get_object_vars($this), get_class_vars(\PHPUnit\Framework\TestCase::class))) as $k) {
+            if (!is_scalar($this->{$k})) {
+                $this->{$k} = null;
+            }
+        }
+
+        // once PHP 8.0 support is dropped, needed only once, see:
+        // https://github.com/php/php-src/commit/b58d74547f7700526b2d7e632032ed808abab442
+        gc_collect_cycles();
+        gc_collect_cycles();
+    }
+
     /**
      * Calls protected method.
      *

tests/AppScopeTraitTest.php

@@ -5,15 +5,15 @@
 namespace Atk4\Core\Tests;
 
 use Atk4\Core\AppScopeTrait;
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\ContainerTrait;
 use Atk4\Core\NameTrait;
+use Atk4\Core\Phpunit\TestCase;
 use Atk4\Core\TrackableTrait;
 
 /**
  * @coversDefaultClass \Atk4\Core\AppScopeTrait
  */
-class AppScopeTraitTest extends AtkPhpunit\TestCase
+class AppScopeTraitTest extends TestCase
 {
     public function testConstruct(): void
     {

tests/CollectionTraitTest.php

@@ -5,12 +5,12 @@
 namespace Atk4\Core\Tests;
 
 use Atk4\Core;
-use Atk4\Core\AtkPhpunit;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\ContainerTrait
  */
-class CollectionTraitTest extends AtkPhpunit\TestCase
+class CollectionTraitTest extends TestCase
 {
     public function testBasic(): void
     {

tests/ConfigTraitTest.php

@@ -4,13 +4,13 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\ConfigTrait;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\ConfigTrait
  */
-class ConfigTraitTest extends AtkPhpunit\TestCase
+class ConfigTraitTest extends TestCase
 {
     /** @var string */
     public $dir = __DIR__ . '/config_test';

tests/ContainerTraitTest.php

@@ -5,12 +5,12 @@
 namespace Atk4\Core\Tests;
 
 use Atk4\Core;
-use Atk4\Core\AtkPhpunit;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\ContainerTrait
  */
-class ContainerTraitTest extends AtkPhpunit\TestCase
+class ContainerTraitTest extends TestCase
 {
     public function testBasic(): void
     {

tests/DebugTraitTest.php

@@ -5,13 +5,13 @@
 namespace Atk4\Core\Tests;
 
 use Atk4\Core\AppScopeTrait;
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\DebugTrait;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\DebugTrait
  */
-class DebugTraitTest extends AtkPhpunit\TestCase
+class DebugTraitTest extends TestCase
 {
     /**
      * Test debug().

tests/DiContainerTraitTest.php

@@ -4,14 +4,14 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\DiContainerTrait;
 use Atk4\Core\Exception;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\DiContainerTrait
  */
-class DiContainerTraitTest extends AtkPhpunit\TestCase
+class DiContainerTraitTest extends TestCase
 {
     public function testFromSeed(): void
     {

tests/DynamicMethodTraitTest.php

@@ -5,15 +5,15 @@
 namespace Atk4\Core\Tests;
 
 use Atk4\Core\AppScopeTrait;
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\DynamicMethodTrait;
 use Atk4\Core\Exception;
 use Atk4\Core\HookTrait;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\DynamicMethodTrait
  */
-class DynamicMethodTraitTest extends AtkPhpunit\TestCase
+class DynamicMethodTraitTest extends TestCase
 {
     public function testConstruct(): void
     {

tests/ExceptionTest.php

@@ -4,14 +4,14 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\Exception;
+use Atk4\Core\Phpunit\TestCase;
 use Atk4\Core\TrackableTrait;
 
 /**
  * @coversDefaultClass \Atk4\Core\Exception
  */
-class ExceptionTest extends AtkPhpunit\TestCase
+class ExceptionTest extends TestCase
 {
     public function testBasic(): void
     {

tests/FactoryTest.php

@@ -4,16 +4,16 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\DiContainerTrait;
 use Atk4\Core\Exception;
 use Atk4\Core\Factory;
 use Atk4\Core\HookBreaker;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\Factory
  */
-class FactoryTest extends AtkPhpunit\TestCase
+class FactoryTest extends TestCase
 {
     public function testMerge1(): void
     {

tests/HookTraitTest.php

@@ -4,15 +4,15 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\Exception;
 use Atk4\Core\HookBreaker;
 use Atk4\Core\HookTrait;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\HookTrait
  */
-class HookTraitTest extends AtkPhpunit\TestCase
+class HookTraitTest extends TestCase
 {
     public function testArguments(): void
     {

tests/InitializerTraitTest.php

@@ -5,13 +5,13 @@
 namespace Atk4\Core\Tests;
 
 use Atk4\Core;
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\Exception;
+use Atk4\Core\Phpunit\TestCase;
 
 /**
  * @coversDefaultClass \Atk4\Core\InitializerTrait
  */
-class InitializerTraitTest extends AtkPhpunit\TestCase
+class InitializerTraitTest extends TestCase
 {
     public function testBasic(): void
     {

tests/LocalizationTest.php

@@ -4,14 +4,14 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\Exception;
+use Atk4\Core\Phpunit\TestCase;
 use Atk4\Core\Translator\Adapter\Generic;
 use Atk4\Core\Translator\ITranslatorAdapter;
 use Atk4\Core\Translator\Translator;
 use Atk4\Data\Persistence;
 
-class LocalizationTest extends AtkPhpunit\TestCase
+class LocalizationTest extends TestCase
 {
     public function testTranslatableTrait(): void
     {

tests/ReadableCaptionTraitTest.php

@@ -4,13 +4,13 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
+use Atk4\Core\Phpunit\TestCase;
 use Atk4\Core\ReadableCaptionTrait;
 
 /**
  * @coversDefaultClass \Atk4\Core\ReadableCaptionTrait
  */
-class ReadableCaptionTraitTest extends AtkPhpunit\TestCase
+class ReadableCaptionTraitTest extends TestCase
 {
     /**
      * Test readableCaption method.

tests/SessionTraitTest.php

@@ -4,15 +4,15 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\Exception;
 use Atk4\Core\NameTrait;
+use Atk4\Core\Phpunit\TestCase;
 use Atk4\Core\SessionTrait;
 
 /**
  * @coversDefaultClass \Atk4\Core\SessionTrait
  */
-class SessionTraitTest extends AtkPhpunit\TestCase
+class SessionTraitTest extends TestCase
 {
     public static function setUpBeforeClass(): void
     {

tests/StaticAddToTest.php

@@ -4,8 +4,8 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\ContainerTrait;
+use Atk4\Core\Phpunit\TestCase;
 use Atk4\Core\StaticAddToTrait;
 use Atk4\Core\TrackableTrait;
 
@@ -60,7 +60,7 @@ public function __construct(string $name)
 /**
  * @coversDefaultClass \Atk4\Core\StaticAddToTrait
  */
-class StaticAddToTest extends AtkPhpunit\TestCase
+class StaticAddToTest extends TestCase
 {
     public function testBasic(): void
     {

tests/TraitUtilTest.php

@@ -4,15 +4,15 @@
 
 namespace Atk4\Core\tests;
 
-use Atk4\Core\AtkPhpunit;
 use Atk4\Core\HookTrait;
 use Atk4\Core\NameTrait;
+use Atk4\Core\Phpunit\TestCase;
 use Atk4\Core\TraitUtil;
 
 /**
  * @coversDefaultClass \Atk4\Core\TraitUtil
  */
-class TraitUtilTest extends AtkPhpunit\TestCase
+class TraitUtilTest extends TestCase
 {
     public function testHasTrait(): void
     {

tests/TranslatorAdapterBase.php

@@ -4,9 +4,9 @@
 
 namespace Atk4\Core\Tests;
 
-use Atk4\Core\AtkPhpunit;
+use Atk4\Core\Phpunit\TestCase;
 
-abstract class TranslatorAdapterBase extends AtkPhpunit\TestCase
+abstract class TranslatorAdapterBase extends TestCase
 {
     abstract public function getTranslatableMock(): object;