Support for PHPUnit 10

Author: phpfui

composer.json

@@ -15,16 +15,14 @@
         "php": ">=8.0  <8.3",
         "nikic/php-parser": "^4.13"
     },
-		"config": {
-			"platform": {
-				"php": "8.0"
-			}
-		},
     "autoload": {
         "psr-4": {"PHPFUI\\PHPUnitSyntaxCoverage\\": "src/PHPFUI/PHPUnitSyntaxCoverage/"}
     },
+    "autoload-dev": {
+        "psr-4": {"badPHP\\": "tests/"}
+    },
     "require-dev": {
-				"phpunit/phpunit": ">=8.0",
+        "phpunit/phpunit": "<11.0",
         "roave/security-advisories": "dev-latest",
         "friendsofphp/php-cs-fixer": "^3.0",
         "symfony/translation-contracts": ">=2.3",

src/PHPFUI/PHPUnitSyntaxCoverage/Extensions.php

@@ -12,7 +12,7 @@
 
 namespace PHPFUI\PHPUnitSyntaxCoverage;
 
-class Extensions extends \PHPUnit\Framework\TestCase implements \PHPUnit\Runner\Hook
+class Extensions extends \PHPUnit\Framework\TestCase
 	{
 	private static \PhpParser\Parser $parser;
 
@@ -82,7 +82,7 @@ public function assertValidPHP(string $code, string $message = '') : void
 				}
 			catch (\Throwable $e)
 				{
-				throw new \PHPFUI\PHPUnitSyntaxCoverage\Exception($message . "\n" . $e->getMessage());
+				throw new \PHPFUI\PHPUnitSyntaxCoverage\Exception($message . "\n" . $e->getMessage() . ": ReflectionClass({$class}) failed to load");
 				}
 			}
 		}
@@ -182,11 +182,11 @@ public function assertValidPHPDirectory(string $directory, string $message = '',
 	 */
 	public function assertValidPHPFile(string $fileName, string $message = '') : void
 		{
-		$this->assertFileExists($fileName, $message);
+		$this->assertFileExists($fileName, $message . ': File does not exist');
 
 		$code = \file_get_contents($fileName);
 
-		$this->assertValidPHP($code, $message);
+		$this->assertValidPHP($code, $message . ': Not valid PHP code');
 
 		if (! $this->skipNamespaceTest)
 			{

tests/UnitTest.php

@@ -17,15 +17,15 @@ public function testDirectory() : void
 		$this->assertValidPHPDirectory(__DIR__ . '/../src', 'src directory is not valid');
 
 		$this->expectException(\PHPFUI\PHPUnitSyntaxCoverage\Exception::class);
-		$this->assertValidPHPDirectory(__DIR__ . '/badPHP', 'badPHP directory is valid (should not be)');
+		$this->assertValidPHPDirectory(__DIR__ . '/fixtures/badPHP', 'badPHP directory is valid (should not be)');
 		}
 
 	public function testInvalidExtendedClassFile() : void
 		{
-		$file = __DIR__ . '/badPHP/BaseClass.php';
+		$file = __DIR__ . '/fixtures/badPHP/BaseClass.php';
 		$this->assertValidPHPFile($file, $file . ' is invalid');
 
-		$file = __DIR__ . '/badPHP/BadClass.php';
+		$file = __DIR__ . '/fixtures/badPHP/BadClass.php';
 		$this->expectException(\PHPFUI\PHPUnitSyntaxCoverage\Exception::class);
 		$this->assertValidPHPFile($file, $file . ' is valid (should not be)');
 		}
@@ -47,10 +47,7 @@ public function testVendorDirectory() : void
 		{
 		$this->skipNamespaceTesting();
 		// Sloppy coding from various packages causes us to have to skip directories.  If only they used PHPUnitSyntaxCoverage they would have detected these issues!
-		$this->addSkipDirectory('package-versions-deprecated');	// phpunit
-		$this->addSkipDirectory('php-cs-fixer');
 		$this->addSkipDirectory('DependencyInjection'); // Symfony\Component\DependencyInjection
-		$this->addSkipDirectory('path-util');	// Webmozart\PathUtil
 		$this->assertValidPHPDirectory(__DIR__ . '/../vendor', 'Vendor directory is not valid');
 		}
 	}

tests/bootstrap.php

@@ -4,24 +4,16 @@
 
 \ini_set('memory_limit', '-1');
 
-function classNameExists(string $className) : string
-  {
-  $path = __DIR__ . "/{$className}.php";
-  $path = \str_replace('\\', '/', $path);
-
-  return \file_exists($path) ? $path : '';
-  }
+\error_reporting(E_ALL);
 
-function autoload($className) : void
+// allow the autoloader to be included from any script that needs it.
+function autoload(string $className) : void
   {
-  $path = \classNameExists($className);
+  $path = \str_replace('\\', DIRECTORY_SEPARATOR, __DIR__ . "/fixtures/{$className}.php");
 
-  if ($path)
-	{
-	/** @noinspection PhpIncludeInspection */
-	include $path;
-	}
+  @include_once $path;
   }
+
 \spl_autoload_register('autoload');
 
 require_once 'vendor/autoload.php';