Change to support PHPUnit 10

bin/convert-psr4-dir.php

@@ -0,0 +1,49 @@
+<?php
+/**
+ * Helper script to convert the tests/ folder to a PSR-4 folder structure.
+ *
+ * Moves tests/example/sub/File.php to tests/Example/Sub/FileTest.php. Only
+ * convert the sub-part of the path (ignore anything before and including
+ * tests/).
+ *
+ * phpcs:disable
+ */
+
+use Mantle\Support\Str;
+use Symfony\Component\Finder\Finder;
+
+use function Mantle\Support\Helpers\str;
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$finder = ( new Finder() )
+	->in( realpath( __DIR__ . '/../tests' ) )
+	->directories()
+	->notPath( '#fixtures|__snapshots__|template-parts#' );
+
+$base = Str::trailing_slash( realpath( __DIR__ . '/../tests/' ) );
+
+foreach ( $finder as $dir ) {
+	$old_dir = $dir->getRealPath();
+
+	if ( ! is_dir( $old_dir ) ) {
+		continue;
+	}
+
+	$parts = str( $old_dir )->after( $base )->explode( '/' );
+
+	$parts = $parts->map(
+		fn ( string $part ) => str( $part )->studly()->value(),
+	);
+
+	$new_dir = $base . $parts->implode( '/' );
+
+	dump( "Moving {$old_dir} to {$new_dir}" );
+
+	shell_exec( "git mv {$old_dir} {$old_dir}-tmp" );
+	shell_exec( "git mv {$old_dir}-tmp {$new_dir}" );
+}
+
+echo "\nDONE!\n";
+
+exit( 0 );

composer.json

@@ -12,7 +12,7 @@
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
-        "alleyinteractive/wp-asset-manager": "^1.3.3",
+        "alleyinteractive/wp-asset-manager": "^1.3.4",
         "alleyinteractive/wp-caper": "^2.0.1",
         "alleyinteractive/wp-concurrent-remote-requests": "^1.0.2",
         "alleyinteractive/wp-filter-side-effects": "^2.0",
@@ -27,7 +27,7 @@
         "league/flysystem-cached-adapter": "^1.1",
         "monolog/monolog": "^2.9.1",
         "nesbot/carbon": "^2.68.1",
-        "nette/php-generator": "^3.6",
+        "nette/php-generator": "^3.6.9",
         "nunomaduro/collision": "^6.0 || ^7.0",
         "nunomaduro/termwind": "^1.15.1",
         "psr/container": "^1.1.1 || ^2.0.2",

phpunit.xml

@@ -5,11 +5,10 @@
 	backupGlobals="false"
 	colors="true"
 	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
-	cacheDirectory=".phpunit.cache"
 >
 	<testsuites>
 		<testsuite name="mantle-framework">
-			<directory prefix="test-" suffix=".php">./tests/</directory>
+			<directory suffix="Test.php">./tests/</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>

src/mantle/assets/composer.json

@@ -5,7 +5,7 @@
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
-        "alleyinteractive/wp-asset-manager": "^1.3.3",
+        "alleyinteractive/wp-asset-manager": "^1.3.4",
         "mantle-framework/contracts": "^0.12",
         "mantle-framework/support": "^0.12"
     },

src/mantle/testing/concerns/trait-reads-annotations.php

@@ -29,10 +29,10 @@ public function get_annotations_for_method(): array {
 		}
 
 		// Use the PHPUnit ^9.5 method if available.
-		if ( method_exists( Test::class, 'parseTestMethodAnnotations' ) ) {
+		if ( method_exists( Test::class, 'parseTestMethodAnnotations' ) ) { // @phpstan-ignore-line
 			return Test::parseTestMethodAnnotations(
 				static::class,
-				$this->getName()
+				$this->getName(), // @phpstan-ignore-line
 			);
 		}
 

tests/assets/test-asset-loader.php → tests/Assets/AssetLoaderTest.php

@@ -5,7 +5,7 @@
 use Mantle\Assets\Asset_Loader;
 use Mantle\Assets\Exception\Asset_Not_Found;
 
-class Test_Asset_Loader extends Test_Case {
+class AssetLoaderTest extends TestCase {
 	public string $build_dir = '';
 
 	public Asset_Loader $loader;
@@ -84,7 +84,7 @@ public function test_asset_enqueue_from_asset_path() {
 		$head = $this->get_wp_head();
 
 		$this->assertStringContainsString(
-			"<script async src='https://example.org/base/app.js?id=8c5b220bf6f482881a90' id='app-js-js'></script>",
+			'<script async src="https://example.org/base/app.js?id=8c5b220bf6f482881a90" id="app-js-js"></script>',
 			$head,
 		);
 

tests/assets/test-asset-manager.php → tests/Assets/AssetManagerTest.php

@@ -7,7 +7,7 @@
 /**
  * @group assets
  */
-class Test_Asset_Manager extends Test_Case {
+class AssetManagerTest extends TestCase {
 	public function test_register_script() {
 		$manager = new Asset_Manager();
 		$manager
@@ -22,7 +22,7 @@ public function test_register_script() {
 			);
 
 		$this->assertStringContainsString(
-			"<script src='https://example.org/script.js' id='script-handle-js'></script>",
+			'<script src="https://example.org/script.js" id="script-handle-js"></script>',
 			$this->get_wp_head(),
 		);
 	}
@@ -37,7 +37,7 @@ public function test_register_style() {
 			);
 
 		$this->assertStringContainsString(
-			"<link rel='stylesheet' id='style-handle-css' href='https://example.org/style.css' media='all' />",
+			'<link rel=\'stylesheet\' id=\'style-handle-css\' href=\'https://example.org/style.css\' media=\'all\' />',
 			$this->get_wp_head(),
 		);
 	}
@@ -53,7 +53,7 @@ public function test_async_script() {
 		$manager->async( 'testsync-script-handle' );
 
 		$this->assertStringContainsString(
-			"<script async src='https://example.org/example-script.js' id='testsync-script-handle-js'></script>",
+			'<script async src="https://example.org/example-script.js" id="testsync-script-handle-js"></script>',
 			$this->get_wp_head(),
 		);
 	}
@@ -66,7 +66,7 @@ public function test_fluent_script() {
 			->async();
 
 		$this->assertStringContainsString(
-			"<script async src='https://example.org/example-fluent.js' id='example-fluent-js'></script>",
+			'<script async src="https://example.org/example-fluent.js" id="example-fluent-js"></script>',
 			$this->get_wp_head(),
 		);
 	}
@@ -78,7 +78,7 @@ public function test_fluent_script_helper() {
 			->async();
 
 		$this->assertStringContainsString(
-			"<script async src='https://example.org/example-helper.js' id='example-helper-js'></script>",
+			'<script async src="https://example.org/example-helper.js" id="example-helper-js"></script>',
 			$this->get_wp_head(),
 		);
 	}
@@ -89,7 +89,6 @@ public function test_core_dependency() {
 		// Prevent a failing test if this is removed in the future.
 		if ( ! isset( $wp_scripts->registered['swfobject'] ) ) {
 			$this->markTestSkipped( 'swfobject is not registered in core, should change the dependency tested against' );
-			return;
 		}
 
 		$version = $wp_scripts->registered['swfobject']->ver;
@@ -101,7 +100,7 @@ public function test_core_dependency() {
 			->async();
 
 		$this->assertStringContainsString(
-			"<script async src='http://example.org/wp-includes/js/swfobject.js?ver={$version}' id='swfobject-js'></script>",
+			'<script async src="http://example.org/wp-includes/js/swfobject.js?ver=' . $version . '" id="swfobject-js"></script>',
 			$this->get_wp_head(),
 		);
 	}

tests/assets/class-test-case.php → tests/Assets/TestCase.php

@@ -9,7 +9,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use WP_Scripts;
 
-abstract class Test_Case extends Framework_Test_Case {
+abstract class TestCase extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -48,6 +48,7 @@ function() {
 	protected function get_wp_head(): string {
 		ob_start();
 		do_action( 'wp_head' );
+		// do_action( 'wp_footer' );
 		return ob_get_clean();
 	}
 

tests/cache/test-cache-manager.php → tests/Cache/CacheManagerTest.php

@@ -7,7 +7,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Predis\Connection\ConnectionException;
 
-class Test_Cache_Manager extends Framework_Test_Case {
+class CacheManagerTest extends Framework_Test_Case {
 	public function test_unconfigured_store() {
 		$this->expectException( InvalidArgumentException::class );
 		$this->expectExceptionMessage( 'Driver not specified for [invalid-store].' );

tests/config/test-repository.php → tests/Config/RepositoryTest.php

@@ -4,7 +4,7 @@
 use Mantle\Config\Repository;
 use PHPUnit\Framework\TestCase;
 
-class Test_Repository extends TestCase {
+class RepositoryTest extends TestCase {
 	/**
 	 * @var Repository
 	 */

tests/console/test-command.php → tests/Console/CommandTest.php

@@ -9,7 +9,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-class Test_Command extends TestCase {
+class CommandTest extends TestCase {
 
 	public function test_registering_command_with_just_name() {
 		$command = new class extends Command {

tests/console/test-generator-command.php → tests/Console/GeneratorCommandTest.php

@@ -13,7 +13,7 @@
 use Mantle\Framework\Console\Generators\Stub_Generator_Command;
 use Mockery as m;
 
-class Test_Generator_Command extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class GeneratorCommandTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	/**
 	 * @var Application
 	 */

tests/console/test-hook-usage-command.php → tests/Console/HookUsageCommandTest.php.bak

@@ -12,7 +12,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 // Disabling until command testing is reimplimented.
-// class Test_Hook_Usage_Command extends Framework_Test_Case {
+// class HookUsageCommandTest extends Framework_Test_Case {
 
 // 	public function test_do_action() {
 // 		$usage = $this->run_command( 'init' )->all();

tests/console/test-parser.php → tests/Console/ParserTest.php

@@ -6,7 +6,7 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
-class Test_Parser extends TestCase {
+class ParserTest extends TestCase {
 
 	public function testBasicParameterParsing() {
 		$results = Parser::parse( 'command:name' );

tests/console/generators/test-printer.php → tests/Console/generators/PrinterTest.php

@@ -7,7 +7,7 @@
 use PHP_CodeSniffer\Runner;
 use PHPUnit\Framework\TestCase;
 
-class Test_Printer extends TestCase {
+class PrinterTest extends TestCase {
 	protected static $temp_dir;
 	protected static $argv;
 

tests/container/test-container-call.php → tests/Container/ContainerCallTest.php

@@ -10,7 +10,7 @@
 use ReflectionException;
 use stdClass;
 
-class Test_Container_Call extends TestCase {
+class ContainerCallTest extends TestCase {
 
 	public function testCallWithAtSignBasedClassReferencesWithoutMethodThrowsException() {
 		$this->expectException( Error::class );
@@ -188,7 +188,7 @@ public function testCallWithoutRequiredParamsThrowsException() {
 
 	public function testCallWithoutRequiredParamsOnClosureThrowsException() {
 		$this->expectException( Binding_Resolution_Exception::class );
-		$this->expectExceptionMessage( 'Unable to resolve dependency [Parameter #0 [ <required> $foo ]] in class Mantle\Tests\Container\Test_Container_Call' );
+		$this->expectExceptionMessage( 'Unable to resolve dependency [Parameter #0 [ <required> $foo ]] in class Mantle\Tests\Container\ContainerCallTest' );
 
 		$container = new Container();
 		$foo       = $container->call(

tests/container/test-container.php → tests/Container/ContainerTest.php

@@ -8,7 +8,7 @@
 use Psr\Container\ContainerExceptionInterface;
 use stdClass;
 
-class Test_Container extends TestCase {
+class ContainerTest extends TestCase {
 	protected function tearDown(): void {
 		Container::set_instance( null );
 	}
@@ -443,7 +443,7 @@ function () {
 
 	public function testMakeWithMethodIsAnAliasForMakeMethod() {
 		$mock = $this->getMockBuilder( Container::class )
-			->setMethods( [ 'make' ] )
+			->onlyMethods( [ 'make' ] )
 			->getMock();
 
 		$mock->expects( $this->once() )

tests/database/factory/test-factory.php → tests/Database/Factory/FactoryTest.php

@@ -9,7 +9,7 @@
 /**
  * @group factory
  */
-class Test_Factory extends Framework_Test_Case {
+class FactoryTest extends Framework_Test_Case {
 	public function test_create_basic_model() {
 		$factory = Testable_Post::factory();
 

tests/database/factory/test-unit-testing-factory.php → tests/Database/Factory/UnitTestingFactoryTest.php

@@ -17,7 +17,7 @@
  *
  * @group factory
  */
-class Test_Unit_Testing_Factory extends Framework_Test_Case {
+class UnitTestingFactoryTest extends Framework_Test_Case {
 	use With_Faker;
 
 	public function test_post_factory() {

tests/database/model/test-attachment.php → tests/Database/Model/AttachmentTest.php

@@ -4,7 +4,7 @@
 use Mantle\Database\Model\Attachment;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Attachment extends Framework_Test_Case {
+class AttachmentTest extends Framework_Test_Case {
 	/**
 	 * @var int
 	 */

tests/database/model/test-comment-object.php → tests/Database/Model/CommentObjectTest.php

@@ -5,7 +5,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class Test_Comment_Object extends Framework_Test_Case {
+class CommentObjectTest extends Framework_Test_Case {
 	public function test_comment_object() {
 		$comment = $this->factory->comment->create_and_get();
 		$object  = Comment::find( $comment );