- upgrade: phpunit v9

kodeart · kodeart · commit 4dc93bbf5169 · 2021-05-03T11:23:31.000+02:00
- updates namespace for unit tests
diff --git a/Tests/LogConstructorTest.php b/Tests/LogConstructorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests;
+namespace Tests\Koded\Logging;
 
 use DateTimeZone;
 use Koded\Logging\Log;
diff --git a/Tests/LogDeferredTest.php b/Tests/LogDeferredTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests;
+namespace Tests\Koded\Logging;
 
 use Koded\Logging\Log;
 use Koded\Logging\Processors\Memory;
@@ -10,7 +10,7 @@ class LogDeferredTest extends TestCase
 {
     use LoggerAttributeTrait;
 
-    private $log;
+    private Log $log;
 
     public function test_message_block()
     {
diff --git a/Tests/LogTest.php b/Tests/LogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests;
+namespace Tests\Koded\Logging;
 
 use Exception;
 use Koded\Logging\Log;
@@ -11,7 +11,7 @@ class LogTest extends TestCase
 {
     use LoggerAttributeTrait;
 
-    private $log;
+    private Log $log;
 
     public function test_default_setup()
     {
@@ -58,8 +58,8 @@ public function test_exception()
         $processor = new Memory([]);
         $this->log->exception(new Exception('The message', 1), $processor);
 
-        $this->assertContains('[CRITICAL]', $this->property($processor, 'formatted'));
-        $this->assertContains('The message', $this->property($processor, 'formatted'));
+        $this->assertStringContainsString('[CRITICAL]', $this->property($processor, 'formatted'));
+        $this->assertStringContainsString('The message', $this->property($processor, 'formatted'));
     }
 
     protected function setUp(): void
diff --git a/Tests/LoggerAttributeTrait.php b/Tests/LoggerAttributeTrait.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests;
+namespace Tests\Koded\Logging;
 
 trait LoggerAttributeTrait
 {
diff --git a/Tests/PhpBench/AbstractBench.php b/Tests/PhpBench/AbstractBench.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\PhpBench;
+namespace Tests\Koded\Logging\PhpBench;
 
 use Koded\Logging\Log;
 
@@ -11,10 +11,7 @@
  */
 abstract class AbstractBench
 {
-    /**
-     * @var Log
-     */
-    protected $log;
+    protected ?Log $log;
 
     public function setUp(): void
     {
diff --git a/Tests/PhpBench/CliBench.php b/Tests/PhpBench/CliBench.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\PhpBench;
+namespace Tests\Koded\Logging\PhpBench;
 
 use Koded\Logging\Processors\Cli;
 
diff --git a/Tests/PhpBench/ErrorLogBench.php b/Tests/PhpBench/ErrorLogBench.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\PhpBench;
+namespace Tests\Koded\Logging\PhpBench;
 
 use Koded\Logging\Processors\ErrorLog;
 
diff --git a/Tests/PhpBench/FileBench.php b/Tests/PhpBench/FileBench.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\PhpBench;
+namespace Tests\Koded\Logging\PhpBench;
 
 use Koded\Logging\Processors\File;
 
diff --git a/Tests/PhpBench/MemoryBench.php b/Tests/PhpBench/MemoryBench.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\PhpBench;
+namespace Tests\Koded\Logging\PhpBench;
 
 use Koded\Logging\Processors\Memory;
 
diff --git a/Tests/PhpBench/SyslogBench.php b/Tests/PhpBench/SyslogBench.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\PhpBench;
+namespace Tests\Koded\Logging\PhpBench;
 
 use Koded\Logging\Processors\Syslog;
 
diff --git a/Tests/Processors/CliTest.php b/Tests/Processors/CliTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\Processors;
+namespace Tests\Koded\Logging\Processors;
 
 use Koded\Logging\Logger;
 use Koded\Logging\Processors\Cli;
diff --git a/Tests/Processors/DefaultProcessorPropertiesTest.php b/Tests/Processors/DefaultProcessorPropertiesTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Koded\Logging\Tests\Processors;
+namespace Tests\Koded\Logging\Processors;
 
 use Koded\Logging\Logger;
 use Koded\Logging\Processors\Memory;
-use Koded\Logging\Tests\LoggerAttributeTrait;
+use Tests\Koded\Logging\LoggerAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 class DefaultProcessorPropertiesTest extends TestCase
diff --git a/Tests/Processors/ErrorLogTest.php b/Tests/Processors/ErrorLogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\Processors;
+namespace Tests\Koded\Logging\Processors;
 
 use Koded\Logging\Logger;
 use Koded\Logging\Processors\ErrorLog;
diff --git a/Tests/Processors/FileTest.php b/Tests/Processors/FileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\Processors;
+namespace Tests\Koded\Logging\Processors;
 
 use Koded\Logging\Processors\{File, FileProcessorException};
 use org\bovigo\vfs\{vfsStream, vfsStreamDirectory, vfsStreamWrapper};
diff --git a/Tests/Processors/MemoryTest.php b/Tests/Processors/MemoryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\Processors;
+namespace Tests\Koded\Logging\Processors;
 
 use Koded\Logging\Processors\Memory;
 use PHPUnit\Framework\TestCase;
@@ -26,6 +26,6 @@ public function test_formatting()
             ]
         ]);
 
-        $this->assertContains("1234567890 [TEST]: Hello\n1234567891 [TEST]: World", $processor->formatted());
+        $this->assertStringContainsString("1234567890 [TEST]: Hello\n1234567891 [TEST]: World", $processor->formatted());
     }
 }
diff --git a/Tests/Processors/SyslogTest.php b/Tests/Processors/SyslogTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Koded\Logging\Tests\Processors;
+namespace Tests\Koded\Logging\Processors;
 
 use Koded\Logging\Logger;
 use Koded\Logging\Processors\Syslog;
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
   "minimum-stability": "dev",
   "require": {
     "php": "^8",
-    "psr/log": "~1",
+    "psr/log": "^1",
     "koded/stdlib": "5.*"
   },
   "autoload": {
@@ -33,13 +33,13 @@
     ]
   },
   "require-dev": {
-    "phpunit/phpunit": "~8",
-    "mikey179/vfsstream": "~1",
+    "phpunit/phpunit": "^9",
+    "mikey179/vfsstream": "^1",
     "phpbench/phpbench": "@dev"
   },
   "autoload-dev": {
     "psr-4": {
-      "Koded\\Logging\\Tests\\": "Tests/"
+      "Tests\\Koded\\Logging\\": "Tests/"
     }
   },
   "extra": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          stopOnFailure="true"
          verbose="true"
@@ -11,15 +11,15 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">./</directory>
-            <exclude>
-                <directory>vendor</directory>
-                <directory>Tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <directory>vendor</directory>
+            <directory>Tests</directory>
+        </exclude>
+    </coverage>
 
     <php>
         <ini name="date.timezone" value="UTC"/>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Koded\Logging\Tests;`
	`3`	`+namespace Tests\Koded\Logging;`
`4`	`4`
`5`	`5`	`use Koded\Logging\Log;`
`6`	`6`	`use Koded\Logging\Processors\Memory;`
`@@ -10,7 +10,7 @@ class LogDeferredTest extends TestCase`
`10`	`10`	`{`
`11`	`11`	`use LoggerAttributeTrait;`
`12`	`12`
`13`		`- private $log;`
	`13`	`+ private Log $log;`
`14`	`14`
`15`	`15`	`public function test_message_block()`
`16`	`16`	`{`