From 95513316b529bc6a894b32ca336a532e83837cf4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 11:40:23 -0400
Subject: [PATCH 01/32] Update phpstan/phpstan requirement from 1.10.32 to
 1.10.33 (#452)

Updates the requirements on [phpstan/phpstan](https://github.com/phpstan/phpstan) to permit the latest version.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.32...1.10.33)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 627f8558..1b14130d 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "mockery/mockery": "^1.6.6",
         "php-stubs/wp-cli-stubs": "^2.8",
         "phpstan/phpdoc-parser": "^1.23.1",
-        "phpstan/phpstan": "1.10.32",
+        "phpstan/phpstan": "1.10.33",
         "phpunit/phpunit": "^9.6.10",
         "predis/predis": "^2.2.0",
         "squizlabs/php_codesniffer": "^3.7",

From 9b63dde8cc7a4e6c727678b149d9d569836a1584 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 11:40:32 -0400
Subject: [PATCH 02/32] Bump actions/checkout from 3 to 4 (#451)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/split_monorepo.yml   | 4 ++--
 .github/workflows/update-changelog.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/split_monorepo.yml b/.github/workflows/split_monorepo.yml
index a3a820ab..9092420c 100644
--- a/.github/workflows/split_monorepo.yml
+++ b/.github/workflows/split_monorepo.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # required for matrix of packages set
       - uses: shivammathur/setup-php@v2
@@ -42,7 +42,7 @@ jobs:
         package: ${{fromJson(needs.provide_packages_json.outputs.matrix)}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # no tag
       -
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index b20f3b6f..94df2c33 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: main
 

From b642d8e06339c61b1ea673d831d3b630ec7bfd21 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Wed, 13 Sep 2023 11:40:42 -0400
Subject: [PATCH 03/32] Ensure that attribute and action methods are
 deduplicated (#447)

* Ensure that attribute and action methods are deduplicated

* Remove a legacy attribute version check

* Add light tests for typehinting events to ease my mind
---
 .../events/class-discover-events.php          | 33 +++++-----
 .../support/attributes/class-action.php       |  6 +-
 src/mantle/support/class-service-provider.php | 66 +++++++++++++------
 .../test-wordpress-action-dispatcher.php      | 20 ++++++
 tests/support/test-service-provider.php       | 47 ++++++++++---
 5 files changed, 122 insertions(+), 50 deletions(-)

diff --git a/src/mantle/framework/events/class-discover-events.php b/src/mantle/framework/events/class-discover-events.php
index 7dafadfe..4c3b695f 100644
--- a/src/mantle/framework/events/class-discover-events.php
+++ b/src/mantle/framework/events/class-discover-events.php
@@ -20,8 +20,6 @@
 
 /**
  * Discover events within a specific directory.
- *
- * @todo Add support for WordPress hooks using attributes.
  */
 class Discover_Events {
 	/**
@@ -80,23 +78,22 @@ protected static function get_listener_events( $listeners, string $base_path ):
 			}
 
 			foreach ( $listener->getMethods( ReflectionMethod::IS_PUBLIC ) as $method ) {
-				// Check for attribute support with PHP 8.
-				if ( version_compare( phpversion(), '8.0.0', '>=' ) ) {
-					// Check if the method has an attribute action.
-					$action_attributes = $method->getAttributes( Action::class );
-
-					if ( ! empty( $action_attributes ) ) {
-						foreach ( $action_attributes as $attribute ) {
-							$instance = $attribute->newInstance();
-
-							$listener_events[ $listener->name . '@' . $method->name ] = [
-								[ $instance->action ],
-								$instance->priority,
-							];
-						}
-
-						continue;
+				// Check if the method has an attribute action.
+				$action_attributes = $method->getAttributes( Action::class );
+
+				if ( ! empty( $action_attributes ) ) {
+					foreach ( $action_attributes as $attribute ) {
+						$instance = $attribute->newInstance();
+
+						$listener_events[ $listener->name . '@' . $method->name ] = [
+							[
+								$instance->hook_name,
+							],
+							$instance->priority,
+						];
 					}
+
+					continue;
 				}
 
 				// Handle WordPress hooks being registered with a listener.
diff --git a/src/mantle/support/attributes/class-action.php b/src/mantle/support/attributes/class-action.php
index 57ab06e5..ead14ada 100644
--- a/src/mantle/support/attributes/class-action.php
+++ b/src/mantle/support/attributes/class-action.php
@@ -12,15 +12,15 @@
 /**
  * Hook Action Attribute
  *
- * Used to hook a method to an WordPress action at a specific priority.
+ * Used to hook a method to an WordPress hook at a specific priority.
  */
 #[Attribute]
 class Action {
 	/**
 	 * Constructor.
 	 *
-	 * @param string $action Action name.
+	 * @param string $hook_name Hook name.
 	 * @param int    $priority Priority, defaults to 10.
 	 */
-	public function __construct( public string $action, public int $priority = 10 ) {}
+	public function __construct( public string $hook_name, public int $priority = 10 ) {}
 }
diff --git a/src/mantle/support/class-service-provider.php b/src/mantle/support/class-service-provider.php
index 33b94a1d..c6676f0e 100644
--- a/src/mantle/support/class-service-provider.php
+++ b/src/mantle/support/class-service-provider.php
@@ -80,24 +80,36 @@ public function boot_provider() {
 		}
 
 		$this->boot_action_hooks();
-		$this->boot_attribute_hooks();
 		$this->boot();
 	}
 
 	/**
-	 * Boot all actions on the service provider.
+	 * Boot all actions and attribute methods on the service provider.
 	 *
-	 * Allow methods in the 'on_{hook}_at_priority' and 'on_{hook}' format
-	 * to automatically register WordPress hooks.
+	 * Collects all of the `on_{hook}` and `on_{hook}_at_{priority}` methods as
+	 * well as the attribute based `#[Action]` methods and registers them with
+	 * the respective WordPress hooks.
 	 */
-	protected function boot_action_hooks() {
-		collect( get_class_methods( static::class ) )
+	protected function boot_action_hooks(): void {
+		$this->collect_action_methods()
+			->merge( $this->collect_attribute_hooks() )
+			->unique()
+			->each(
+				fn ( array $item ) => add_action( $item['hook'], [ $this, $item['method'] ], $item['priority'] ),
+			);
+	}
+
+	/**
+	 * Collect all action methods from the service provider.
+	 *
+	 * @return Collection<int, array{hook: string, method: string, priority: int}>
+	 */
+	protected function collect_action_methods(): Collection {
+		return collect( get_class_methods( static::class ) )
 			->filter(
-				function( string $method ) {
-					return Str::starts_with( $method, 'on_' );
-				}
+				fn ( string $method ) => Str::starts_with( $method, 'on_' )
 			)
-			->each(
+			->map(
 				function( string $method ) {
 					$hook     = Str::after( $method, 'on_' );
 					$priority = 10;
@@ -108,30 +120,42 @@ function( string $method ) {
 						$hook     = Str::before_last( $hook, '_at_' );
 					}
 
-					add_action( $hook, [ $this, $method ], $priority );
+					return [
+						'hook'     => $hook,
+						'method'   => $method,
+						'priority' => $priority,
+					];
 				}
 			);
 	}
 
 	/**
-	 * Boot all attribute actions on the service provider.
+	 * Collect all attribute actions on the service provider.
+	 *
+	 * Allow methods with the `#[Action]` attribute to automatically register
+	 * WordPress hooks.
+	 *
+	 * @return Collection<int, array{hook: string, method: string, priority: int}>
 	 */
-	protected function boot_attribute_hooks() {
+	protected function collect_attribute_hooks(): Collection {
+		$items = new Collection();
 		$class = new ReflectionClass( static::class );
 
 		foreach ( $class->getMethods() as $method ) {
-			$action_attributes = $method->getAttributes( Action::class );
-
-			if ( empty( $action_attributes ) ) {
-				continue;
-			}
-
-			foreach ( $action_attributes as $attribute ) {
+			foreach ( $method->getAttributes( Action::class ) as $attribute ) {
 				$instance = $attribute->newInstance();
 
-				add_action( $instance->action, [ $this, $method->name ], $instance->priority );
+				$items->push(
+					[
+						'hook'     => $instance->hook_name,
+						'method'   => $method->getName(),
+						'priority' => $instance->priority,
+					]
+				);
 			}
 		}
+
+		return $items;
 	}
 
 	/**
diff --git a/tests/events/test-wordpress-action-dispatcher.php b/tests/events/test-wordpress-action-dispatcher.php
index 9abc88dc..297e0cea 100644
--- a/tests/events/test-wordpress-action-dispatcher.php
+++ b/tests/events/test-wordpress-action-dispatcher.php
@@ -170,4 +170,24 @@ function() {
 		do_action( 'test_action_to_fire' );
 		$this->assertTrue( $_SERVER['__test'] );
 	}
+
+	public function test_typehint_action_argument() {
+		$_SERVER['__test'] = false;
+
+		add_action(
+			Example_Typehint_Event::class,
+			function ( Example_Typehint_Event $event ): void {
+				$_SERVER['__test'] = $event;
+			}
+		);
+
+		$this->app['events']->dispatch( new Example_Typehint_Event( 'test' ) );
+
+		$this->assertInstanceOf( Example_Typehint_Event::class, $_SERVER['__test'] );
+		$this->assertEquals( 'test', $_SERVER['__test']->example );
+	}
+}
+
+class Example_Typehint_Event {
+	public function __construct( public string $example ) {}
 }
diff --git a/tests/support/test-service-provider.php b/tests/support/test-service-provider.php
index 3ea82d49..8b42d9c8 100644
--- a/tests/support/test-service-provider.php
+++ b/tests/support/test-service-provider.php
@@ -4,6 +4,7 @@
 use Mantle\Application\Application;
 use Mantle\Console\Command;
 use Mantle\Contracts\Providers as ProviderContracts;
+use Mantle\Events\Dispatcher;
 use Mantle\Support\Service_Provider;
 use Mantle\Support\Attributes\Action;
 use Mockery as m;
@@ -14,6 +15,7 @@ protected function setUp(): void {
 
 		remove_all_actions( 'init' );
 		remove_all_filters( 'custom_filter' );
+		remove_all_filters( 'custom_filter_dedupe' );
 
 		Service_Provider::$publishes = [];
 		Service_Provider::$publish_tags = [];
@@ -66,12 +68,6 @@ public function test_hook_method_filter() {
 	}
 
 	public function test_hook_attribute() {
-		// Abandon if we're not running PHP 8.
-		if ( version_compare( phpversion(), '8.0.0', '<' ) ) {
-			$this->markTestSkipped( 'Requires PHP 8.0.0 or greater.' );
-			return;
-		}
-
 		$app = m::mock( Application::class )->makePartial();
 		$app->register( Provider_Test_Hook::class );
 		$app->boot();
@@ -81,6 +77,30 @@ public function test_hook_attribute() {
 		$this->assertTrue( $_SERVER['__custom_hook_fired'] ?? false );
 	}
 
+	public function test_hook_attribute_deduplicate() {
+		$app = m::mock( Application::class )->makePartial();
+		$app->register( Provider_Test_Hook::class );
+		$app->boot();
+
+		$value = apply_filters( 'custom_filter_dedupe', 0 );
+
+		$this->assertEquals( 10, $value );
+	}
+
+	public function test_typehint_event() {
+		$_SERVER['__custom_event_fired'] = false;
+
+		$app = m::mock( Application::class )->makePartial();
+		$app->register( Provider_Test_Hook::class );
+		$app->boot();
+
+		$app['events'] = new Dispatcher( $app );
+
+		$app['events']->dispatch( new Example_Service_Provider_Event() );
+
+		$this->assertInstanceOf( Example_Service_Provider_Event::class, $_SERVER['__custom_event_fired'] );
+	}
+
 	public function test_publishable_service_providers() {
 		$app = m::mock( Application::class )->makePartial();
 		$app->register( ServiceProviderForTestingOne::class );
@@ -248,8 +268,15 @@ public function handle_custom_hook() {
 		$_SERVER['__custom_hook_fired'] = true;
 	}
 
-	public function handle_custom_filter( $value ) {
-		return $value + 100;
+	// Assert that only a single action is registered for this hook.
+	#[Action('custom_filter_dedupe')]
+	public function on_custom_filter_dedupe( $value ) {
+		return $value + 10;
+	}
+
+	#[Action(Example_Service_Provider_Event::class)]
+	public function handle_custom_event( Example_Service_Provider_Event $event ) {
+		$_SERVER['__custom_event_fired'] = $event;
 	}
 }
 
@@ -270,3 +297,7 @@ public function boot() {
 		$this->publishes( [ 'source/tagged/two/b' => 'destination/tagged/two/b' ], 'some_tag' );
 	}
 }
+
+class Example_Service_Provider_Event {
+
+}

From d96e8bc9609abe58b0efcb17518d00eb770dec50 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Wed, 13 Sep 2023 16:43:41 -0400
Subject: [PATCH 04/32] WIP

---
 .../query/class-post-query-builder.php        |   4 +-
 .../query/concerns/trait-queries-dates.php    | 242 ++++++++++++++++++
 .../query/test-post-query-builder.php         |  56 ++++
 3 files changed, 301 insertions(+), 1 deletion(-)
 create mode 100644 src/mantle/database/query/concerns/trait-queries-dates.php

diff --git a/src/mantle/database/query/class-post-query-builder.php b/src/mantle/database/query/class-post-query-builder.php
index 08f2158f..74e6dfc2 100644
--- a/src/mantle/database/query/class-post-query-builder.php
+++ b/src/mantle/database/query/class-post-query-builder.php
@@ -9,6 +9,7 @@
 namespace Mantle\Database\Query;
 
 use Mantle\Database\Model\Term;
+use Mantle\Database\Query\Concerns\Queries_Dates;
 use Mantle\Support\Helpers;
 use Mantle\Support\Collection;
 use WP_Term;
@@ -30,7 +31,7 @@
  * @method \Mantle\Database\Query\Post_Query_Builder<TModel> whereType( string $type )
  */
 class Post_Query_Builder extends Builder {
-	use Queries_Relationships;
+	use Queries_Dates, Queries_Relationships;
 
 	/**
 	 * Query Variable Aliases
@@ -121,6 +122,7 @@ public function get_query_args(): array {
 				'suppress_filters'    => false,
 				'tax_query'           => $this->tax_query, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
 			],
+			$this->get_date_query_args(),
 			$this->wheres,
 		);
 	}
diff --git a/src/mantle/database/query/concerns/trait-queries-dates.php b/src/mantle/database/query/concerns/trait-queries-dates.php
new file mode 100644
index 00000000..ff5e7afd
--- /dev/null
+++ b/src/mantle/database/query/concerns/trait-queries-dates.php
@@ -0,0 +1,242 @@
+<?php
+/**
+ * Queries_Dates trait file
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Database\Query\Concerns;
+
+use Carbon\Carbon;
+use DateTimeInterface;
+use InvalidArgumentException;
+
+/**
+ * Logic to query posts by dates.
+ *
+ * @link https://developer.wordpress.org/reference/classes/wp_query/#date-parameters
+ *
+ * @mixin \Mantle\Database\Query\Post_Query_Builder
+ */
+trait Queries_Dates {
+	/**
+	 * Date constraints to apply to the query.
+	 *
+	 * @var array<int, array<{date: DateTimeInterface|int|string, compare: string, column: string}>>
+	 */
+	protected array $date_constraints = [];
+
+	/**
+	 * The valid comparison operators for a date query.
+	 *
+	 * @var array
+	 */
+	protected array $date_operators = [
+		'=',
+		'!=',
+		'>',
+		'>=',
+		'<',
+		'<=',
+	];
+
+	/**
+	 * Add a date query for a specific date to the query.
+	 *
+	 * @param DateTimeInterface|int|string $date
+	 * @param string $compare Comparison operator, defaults to '='.
+	 * @param string $column Column to compare against, defaults to 'post_date'.
+	 * @return static
+	 */
+	public function whereDate( DateTimeInterface|int|string $date, string $compare = '=', string $column = 'post_date' ): static {
+		if ( ! in_array( $compare, $this->date_operators, true ) ) {
+			throw new InvalidArgumentException( 'Invalid date comparison operator: ' . $compare );
+		}
+
+		$this->date_constraints[] = compact( 'date', 'compare', 'column' );
+
+		return $this;
+	}
+
+	// public function whereDateBetween(
+	// 	DateTimeInterface|int|string $start,
+	// 	DateTimeInterface|int|string $end,
+	// 	string $column = 'post_date'
+	// ): static {
+	// 	$this->date_constraints[] = [
+	// 		'date1'  => $date1,
+	// 		'date2'  => $date2,
+	// 		'column' => $column,
+	// 	];
+
+	// 	return $this;
+	// }
+
+	/**
+	 * Query for objects older than the given date.
+	 *
+	 * @param DateTimeInterface|int $date
+	 * @return static
+	 */
+	public function olderThan( DateTimeInterface|int $date ): static {
+		return $this->whereDate( $date, '<' );
+	}
+
+	/**
+	 * Query for objects older than or equal to the given date.
+	 *
+	 * @param DateTimeInterface|int $date
+	 * @return static
+	 */
+	public function olderThanOrEqualTo( DateTimeInterface|int $date ): static {
+		return $this->whereDate( $date, '<=' );
+	}
+
+	/**
+	 * Alias for olderThan().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function older_than( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->olderThan( $date, $column );
+	}
+
+	/**
+	 * Alias for olderThanOrEqualTo().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function older_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '<=', $column );
+	}
+
+	/**
+	 * Query for objects newer than the given date.
+	 *
+	 * @param DateTimeInterface|int $date
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function newerThan( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '>', $column );
+	}
+
+	/**
+	 * Query for objects newer than or equal to the given date.
+	 *
+	 * @param DateTimeInterface|int $date
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function newerThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '>=', $column );
+	}
+
+	/**
+	 * Alias for newerThan().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function newer_than( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->newerThan( $date, $column );
+	}
+
+	/**
+	 * Alias for newerThanOrEqualTo().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function newer_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->newerThanOrEqualTo( $date, $column );
+	}
+
+	/**
+	 * Calculate the arguments for the date query to pass to either WP_Query.
+	 *
+	 * @return array
+	 */
+	protected function get_date_query_args(): array {
+		if ( empty( $this->date_constraints ) ) {
+			return [];
+		}
+
+		$date_query = [];
+
+		foreach ( $this->date_constraints as $constraint ) {
+			$date = $constraint['date'];
+
+			if ( is_int( $date ) ) {
+				$date = Carbon::createFromTimestamp( $date, wp_timezone() );
+			} elseif ( is_string( $date ) ) {
+				$date = Carbon::parse( $date, wp_timezone() );
+			} elseif ( $date instanceof DateTimeInterface ) {
+				$date = Carbon::instance( $date );
+			}
+
+			switch ( $constraint['compare'] ) {
+				case '<':
+					$date_query[] = [
+						'column' => $constraint['column'],
+						'before' => $date->toDateTimeString(),
+					];
+					break;
+
+				case '<=':
+					$date_query[] = [
+						'column'    => $constraint['column'],
+						'before'    => $date->toDateTimeString(),
+						'inclusive' => true,
+					];
+					break;
+
+				case '>':
+					$date_query[] = [
+						'column' => $constraint['column'],
+						'after'  => $date->toDateTimeString(),
+					];
+					break;
+
+				case '>=':
+					$date_query[] = [
+						'column'    => $constraint['column'],
+						'after'     => $constraint['date']->toDateTimeString(),
+						'inclusive' => true,
+					];
+					break;
+
+				case '=':
+				case '!=':
+					$date_query[] = [
+						'compare'             => $constraint['compare'],
+						// $constraint['column'] => $date->toDateTimeString(),
+						// 'post_d'
+						'column' => $constraint['column'],
+						'year'   => $date->format( 'Y' ),
+						'month'  => $date->format( 'm' ),
+						'day'    => $date->format( 'd' ),
+						'hour'   => $date->format( 'H' ),
+						'minute' => $date->format( 'i' ),
+						'second' => $date->format( 's' ),
+					];
+					break;
+			}
+		}
+
+		return [
+			'date_query' => $date_query,
+		];
+
+		$query = new \WP_Date_Query( $date_query );
+		dd( $query->get_sql() );
+
+		dd( $this->date_constraints );
+	}
+}
diff --git a/tests/database/query/test-post-query-builder.php b/tests/database/query/test-post-query-builder.php
index c0fa3a35..e8cd2867 100644
--- a/tests/database/query/test-post-query-builder.php
+++ b/tests/database/query/test-post-query-builder.php
@@ -18,7 +18,9 @@ class Test_Post_Query_Builder extends Framework_Test_Case {
 
 	protected function setUp(): void {
 		parent::setUp();
+
 		Utils::delete_all_data();
+
 		register_post_type( Another_Testable_Post::get_object_name() );
 	}
 
@@ -525,6 +527,60 @@ public function test_count() {
 		$this->assertEquals( 1, Testable_Post::whereIn( 'id', [ $post_id ] )->count() );
 	}
 
+	public function test_date() {
+		$date = Carbon::now( wp_timezone() )->subMonth();
+
+		$expected = Testable_Post::factory()->create( [
+			'post_date' => $date->toDateTimeString(),
+		] );
+
+		$other = Testable_Post::factory()->create( [
+			'post_date' => $date->clone()->nowWithSameTz()->toDateTimeString(),
+		] );
+
+		// $this->assertEquals( $expected, Testable_Post::query()->dumpSql()->whereDate( $date )->first()->id );
+		// $this->assertEquals( $expected, Testable_Post::query()->whereDate( $date->toDateTimeString() )->first()->id );
+		// $this->assertFalse( Testable_Post::query()->whereDate( $date->addDay() )->exists() );
+		$this->assertEquals( $other, Testable_Post::query()->dumpSql()->whereDate( $date->toDateTimeString(), '!=' )->first()?->id );
+	}
+
+	/**
+	 * @dataProvider date_comparison_provider
+	 */
+	public function test_date_comparisons( int $expected, string $method, array $args ) {
+		$start = Carbon::now( wp_timezone() )->subMonth()->startOfDay();
+
+		static::factory()->post->create_ordered_set( 20, [], $start->clone() );
+
+		$this->assertEquals(
+			$expected,
+			Testable_Post::query()->{$method}( ...$args )->count(),
+		);
+	}
+
+	public static function date_comparison_provider(): array {
+		$start = Carbon::now( wp_timezone() )->subMonth()->startOfDay();
+
+		return [
+			// Older than now should return all posts.
+			'older_than_now' => [ 20, 'olderThan', [ Carbon::now( wp_timezone() ) ] ],
+			// Older than the start date should return no posts.
+			'older_than_start' => [ 0, 'olderThan', [ $start ] ],
+			// Older than or equal to the start date should return the first post.
+			'older_than_or_equal_to_start' => [ 1, 'olderThanOrEqualTo', [ $start ] ],
+			// Older than 5 hrs from start should return 5 posts.
+			'older_than_5_hrs' => [ 5, 'olderThan', [ $start->clone()->addHours( 5 ) ] ],
+			// Newer than 5 hrs from start should return 14 posts.
+			'newer_than_5_hrs' => [ 14, 'newerThan', [ $start->clone()->addHours( 5 ) ] ],
+			// Newer than or equal to 5 hrs from start should return 15 posts.
+			'newer_than_or_equal_to_5_hrs' => [ 15, 'newerThanOrEqualTo', [ $start->clone()->addHours( 5 ) ] ],
+			// Older than the middle post should return 10 posts.
+			'older_than_middle' => [ 10, 'olderThan', [ $start->clone()->addHours( 10 ) ] ],
+			// Newer than the middle post should return 10 posts.
+			'newer_than_middle' => [ 10, 'newerThanOrEqualTo', [ $start->clone()->addHours( 10 ) ] ],
+		];
+	}
+
 	/**
 	 * Get a random post ID, ensures the post ID is not the last in the set.
 	 *

From c91d15ae67db0524d15946e272b233dd827b04f1 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Thu, 14 Sep 2023 15:30:21 -0400
Subject: [PATCH 05/32] Adding in the basis of the date query

---
 .../query/concerns/trait-queries-dates.php    | 116 ++++++++++++------
 .../concerns/trait-wordpress-state.php        |  23 ++--
 .../query/test-post-query-builder.php         |  67 ++++++++--
 3 files changed, 149 insertions(+), 57 deletions(-)

diff --git a/src/mantle/database/query/concerns/trait-queries-dates.php b/src/mantle/database/query/concerns/trait-queries-dates.php
index ff5e7afd..3fb96588 100644
--- a/src/mantle/database/query/concerns/trait-queries-dates.php
+++ b/src/mantle/database/query/concerns/trait-queries-dates.php
@@ -2,6 +2,8 @@
 /**
  * Queries_Dates trait file
  *
+ * phpcs:disable WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
+ *
  * @package Mantle
  */
 
@@ -22,7 +24,7 @@ trait Queries_Dates {
 	/**
 	 * Date constraints to apply to the query.
 	 *
-	 * @var array<int, array<{date: DateTimeInterface|int|string, compare: string, column: string}>>
+	 * @var array<int, array{date: DateTimeInterface|int|string, compare: string, column: string}>
 	 */
 	protected array $date_constraints = [];
 
@@ -41,11 +43,15 @@ trait Queries_Dates {
 	];
 
 	/**
-	 * Add a date query for a specific date to the query.
+	 * Add a date query for a date to the query.
+	 *
+	 * Defaults to comparing against the post published date.
+	 *
+	 * @throws InvalidArgumentException If an invalid comparison operator is provided.
 	 *
 	 * @param DateTimeInterface|int|string $date
-	 * @param string $compare Comparison operator, defaults to '='.
-	 * @param string $column Column to compare against, defaults to 'post_date'.
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @param string                       $column Column to compare against, defaults to 'post_date'.
 	 * @return static
 	 */
 	public function whereDate( DateTimeInterface|int|string $date, string $compare = '=', string $column = 'post_date' ): static {
@@ -58,19 +64,38 @@ public function whereDate( DateTimeInterface|int|string $date, string $compare =
 		return $this;
 	}
 
-	// public function whereDateBetween(
-	// 	DateTimeInterface|int|string $start,
-	// 	DateTimeInterface|int|string $end,
-	// 	string $column = 'post_date'
-	// ): static {
-	// 	$this->date_constraints[] = [
-	// 		'date1'  => $date1,
-	// 		'date2'  => $date2,
-	// 		'column' => $column,
-	// 	];
+	/**
+	 * Add a date query for the UTC publish date to the query.
+	 *
+	 * @param DateTimeInterface|int|string $date Date to compare against.
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @return static
+	 */
+	public function whereUtcDate( DateTimeInterface|int|string $date, string $compare = '=' ): static {
+		return $this->whereDate( $date, $compare, 'post_date_gmt' );
+	}
+
+	/**
+	 * Add a date query for the modified date to the query.
+	 *
+	 * @param DateTimeInterface|int|string $date Date to compare against.
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @return static
+	 */
+	public function whereModifiedDate( DateTimeInterface|int|string $date, string $compare = '=' ): static {
+		return $this->whereDate( $date, $compare, 'post_modified' );
+	}
 
-	// 	return $this;
-	// }
+	/**
+	 * Add a date query for the modified UTC date to the query.
+	 *
+	 * @param DateTimeInterface|int|string $date Date to compare against.
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @return static
+	 */
+	public function whereModifiedUtcDate( DateTimeInterface|int|string $date, string $compare = '=' ): static {
+		return $this->whereDate( $date, $compare, 'post_modified_gmt' );
+	}
 
 	/**
 	 * Query for objects older than the given date.
@@ -96,18 +121,17 @@ public function olderThanOrEqualTo( DateTimeInterface|int $date ): static {
 	 * Alias for olderThan().
 	 *
 	 * @param DateTimeInterface|int $date Date to compare against.
-	 * @param string $column Column to compare against.
 	 * @return static
 	 */
-	public function older_than( DateTimeInterface|int $date, string $column = 'post_date' ): static {
-		return $this->olderThan( $date, $column );
+	public function older_than( DateTimeInterface|int $date ): static {
+		return $this->olderThan( $date );
 	}
 
 	/**
 	 * Alias for olderThanOrEqualTo().
 	 *
 	 * @param DateTimeInterface|int $date Date to compare against.
-	 * @param string $column Column to compare against.
+	 * @param string                $column Column to compare against.
 	 * @return static
 	 */
 	public function older_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' ): static {
@@ -118,7 +142,7 @@ public function older_than_or_equal_to( DateTimeInterface|int $date, string $col
 	 * Query for objects newer than the given date.
 	 *
 	 * @param DateTimeInterface|int $date
-	 * @param string $column Column to compare against.
+	 * @param string                $column Column to compare against.
 	 * @return static
 	 */
 	public function newerThan( DateTimeInterface|int $date, string $column = 'post_date' ): static {
@@ -129,7 +153,7 @@ public function newerThan( DateTimeInterface|int $date, string $column = 'post_d
 	 * Query for objects newer than or equal to the given date.
 	 *
 	 * @param DateTimeInterface|int $date
-	 * @param string $column Column to compare against.
+	 * @param string                $column Column to compare against.
 	 * @return static
 	 */
 	public function newerThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' ): static {
@@ -140,7 +164,7 @@ public function newerThanOrEqualTo( DateTimeInterface|int $date, string $column
 	 * Alias for newerThan().
 	 *
 	 * @param DateTimeInterface|int $date Date to compare against.
-	 * @param string $column Column to compare against.
+	 * @param string                $column Column to compare against.
 	 * @return static
 	 */
 	public function newer_than( DateTimeInterface|int $date, string $column = 'post_date' ): static {
@@ -151,7 +175,7 @@ public function newer_than( DateTimeInterface|int $date, string $column = 'post_
 	 * Alias for newerThanOrEqualTo().
 	 *
 	 * @param DateTimeInterface|int $date Date to compare against.
-	 * @param string $column Column to compare against.
+	 * @param string                $column Column to compare against.
 	 * @return static
 	 */
 	public function newer_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' ): static {
@@ -207,24 +231,41 @@ protected function get_date_query_args(): array {
 				case '>=':
 					$date_query[] = [
 						'column'    => $constraint['column'],
-						'after'     => $constraint['date']->toDateTimeString(),
+						'after'     => $date->toDateTimeString(),
 						'inclusive' => true,
 					];
 					break;
 
+				// TODO: Review if a query for a specific date can be improved.
 				case '=':
+					$date_query[] = [
+						'relation' => 'and',
+						[
+							'column'    => $constraint['column'],
+							'before'    => $date->toDateTimeString(),
+							'inclusive' => true,
+						],
+						[
+							'column'    => $constraint['column'],
+							'after'     => $date->toDateTimeString(),
+							'inclusive' => true,
+						],
+					];
+					break;
+
 				case '!=':
 					$date_query[] = [
-						'compare'             => $constraint['compare'],
-						// $constraint['column'] => $date->toDateTimeString(),
-						// 'post_d'
-						'column' => $constraint['column'],
-						'year'   => $date->format( 'Y' ),
-						'month'  => $date->format( 'm' ),
-						'day'    => $date->format( 'd' ),
-						'hour'   => $date->format( 'H' ),
-						'minute' => $date->format( 'i' ),
-						'second' => $date->format( 's' ),
+						'relation' => 'or',
+						[
+							'column'    => $constraint['column'],
+							'before'    => $date->toDateTimeString(),
+							'inclusive' => false,
+						],
+						[
+							'column'    => $constraint['column'],
+							'after'     => $date->toDateTimeString(),
+							'inclusive' => false,
+						],
 					];
 					break;
 			}
@@ -233,10 +274,5 @@ protected function get_date_query_args(): array {
 		return [
 			'date_query' => $date_query,
 		];
-
-		$query = new \WP_Date_Query( $date_query );
-		dd( $query->get_sql() );
-
-		dd( $this->date_constraints );
 	}
 }
diff --git a/src/mantle/testing/concerns/trait-wordpress-state.php b/src/mantle/testing/concerns/trait-wordpress-state.php
index bdb34666..4b38229a 100644
--- a/src/mantle/testing/concerns/trait-wordpress-state.php
+++ b/src/mantle/testing/concerns/trait-wordpress-state.php
@@ -7,7 +7,11 @@
 
 namespace Mantle\Testing\Concerns;
 
+use Carbon\Carbon;
+use DateTimeInterface;
+use Mantle\Database\Model\Post;
 use Mantle\Testing\Utils;
+use WP_Post;
 
 /**
  * This trait includes functionality for controlling WordPress state during
@@ -159,22 +163,27 @@ public function set_permalink_structure( $structure = '' ) {
 	 *
 	 * @global \wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int    $post_id Post ID.
-	 * @param string $date    Post date, in the format YYYY-MM-DD HH:MM:SS.
+	 * @param WP_Post|Post|int         $post Post ID or post object.
+	 * @param DateTimeInterface|string $date Date object or string to update the
+	 *                                       post with. If a string is passed it
+	 *                                       is assumed to be local timezone.
 	 * @return int|false 1 on success, or false on error.
 	 */
-	protected function update_post_modified( $post_id, $date ) {
+	protected function update_post_modified( WP_Post|Post|int $post, DateTimeInterface|string $date ) {
 		global $wpdb;
 
+		$post = is_object( $post ) ? $post->ID : $post;
+		$date = $date instanceof DateTimeInterface ? Carbon::instance( $date ) : Carbon::parse( $date, wp_timezone() );
+
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
 		$update = $wpdb->update(
 			$wpdb->posts,
 			[
-				'post_modified'     => $date,
-				'post_modified_gmt' => $date,
+				'post_modified'     => $date->setTimezone( wp_timezone() )->format( 'Y-m-d H:i:s' ),
+				'post_modified_gmt' => $date->setTimezone( new \DateTimeZone( 'UTC' ) )->format( 'Y-m-d H:i:s' ),
 			],
 			[
-				'ID' => $post_id,
+				'ID' => $post,
 			],
 			[
 				'%s',
@@ -185,7 +194,7 @@ protected function update_post_modified( $post_id, $date ) {
 			]
 		);
 
-		clean_post_cache( $post_id );
+		clean_post_cache( $post );
 
 		return $update;
 	}
diff --git a/tests/database/query/test-post-query-builder.php b/tests/database/query/test-post-query-builder.php
index e8cd2867..bbfb2ada 100644
--- a/tests/database/query/test-post-query-builder.php
+++ b/tests/database/query/test-post-query-builder.php
@@ -527,21 +527,68 @@ public function test_count() {
 		$this->assertEquals( 1, Testable_Post::whereIn( 'id', [ $post_id ] )->count() );
 	}
 
-	public function test_date() {
-		$date = Carbon::now( wp_timezone() )->subMonth();
+	public function test_post_by_date() {
+		$old_date = Carbon::now( wp_timezone() )->subMonth();
+		$now      = Carbon::now( wp_timezone() );
 
-		$expected = Testable_Post::factory()->create( [
-			'post_date' => $date->toDateTimeString(),
+		$old_post_id = Testable_Post::factory()->create( [
+			'post_date' => $old_date->toDateTimeString(),
 		] );
 
-		$other = Testable_Post::factory()->create( [
-			'post_date' => $date->clone()->nowWithSameTz()->toDateTimeString(),
+		$now_post_id = Testable_Post::factory()->create( [
+			'post_date' => $now->toDateTimeString(),
 		] );
 
-		// $this->assertEquals( $expected, Testable_Post::query()->dumpSql()->whereDate( $date )->first()->id );
-		// $this->assertEquals( $expected, Testable_Post::query()->whereDate( $date->toDateTimeString() )->first()->id );
-		// $this->assertFalse( Testable_Post::query()->whereDate( $date->addDay() )->exists() );
-		$this->assertEquals( $other, Testable_Post::query()->dumpSql()->whereDate( $date->toDateTimeString(), '!=' )->first()?->id );
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->whereDate( $old_date )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereDate( $now )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereDate( $old_date, '!=' )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->whereDate( $now, '!=' )->first()?->id,
+		);
+	}
+
+	public function test_post_by_modified_date() {
+		$old_date = Carbon::now( wp_timezone() )->subMonth();
+		$now      = Carbon::now( wp_timezone() );
+
+		$old_post_id = Testable_Post::factory()->create();
+		$now_post_id = Testable_Post::factory()->create();
+
+		$this->update_post_modified( $old_post_id, $old_date );
+		$this->update_post_modified( $now_post_id, $now );
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->whereModifiedDate( $old_date )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereModifiedDate( $now )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereModifiedDate( $old_date, '!=' )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->whereModifiedDate( $now, '!=' )->first()?->id,
+		);
 	}
 
 	/**

From f5383db6aac94ac7d2477df08378b0ca54695e32 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Thu, 14 Sep 2023 15:45:04 -0400
Subject: [PATCH 06/32] Ensure where() can be used still

---
 src/mantle/database/query/class-builder.php            | 5 +++++
 src/mantle/database/query/class-post-query-builder.php | 6 ++++++
 tests/database/query/test-post-query-builder.php       | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/src/mantle/database/query/class-builder.php b/src/mantle/database/query/class-builder.php
index 401cf85c..da6c1779 100644
--- a/src/mantle/database/query/class-builder.php
+++ b/src/mantle/database/query/class-builder.php
@@ -302,6 +302,11 @@ public function where( array|string $attribute, mixed $value = '' ): static {
 
 		$attribute = $this->resolve_attribute( $attribute );
 
+		// Pass date attributes to the date query builder if available.
+		if ( method_exists( $this, 'whereDate' ) && in_array( $attribute, [ 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt' ], true ) ) {
+			return $this->whereDate( $value, '=', $attribute );
+		}
+
 		$this->wheres[ $attribute ] = $value;
 
 		return $this;
diff --git a/src/mantle/database/query/class-post-query-builder.php b/src/mantle/database/query/class-post-query-builder.php
index 74e6dfc2..ca88e7b6 100644
--- a/src/mantle/database/query/class-post-query-builder.php
+++ b/src/mantle/database/query/class-post-query-builder.php
@@ -39,7 +39,13 @@ class Post_Query_Builder extends Builder {
 	 * @var array
 	 */
 	protected array $query_aliases = [
+		'date_gmt'    => 'post_date_gmt',
+		'date_utc'    => 'post_date_gmt',
+		'date'        => 'post_date',
 		'id'          => 'p',
+		'modified_gmt' => 'post_modified_gmt',
+		'modified_utc' => 'post_modified_gmt',
+		'modified'    => 'post_modified',
 		'post_author' => 'author',
 		'post_name'   => 'name',
 		'slug'        => 'name',
diff --git a/tests/database/query/test-post-query-builder.php b/tests/database/query/test-post-query-builder.php
index bbfb2ada..c735ad73 100644
--- a/tests/database/query/test-post-query-builder.php
+++ b/tests/database/query/test-post-query-builder.php
@@ -549,6 +549,11 @@ public function test_post_by_date() {
 			Testable_Post::query()->whereDate( $now )->first()?->id,
 		);
 
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->where( 'date', $old_date )->first()?->id,
+		);
+
 		$this->assertEquals(
 			$now_post_id,
 			Testable_Post::query()->whereDate( $old_date, '!=' )->first()?->id,

From a5426bed5d3465c9c5babb2e79f3ece7063a40b7 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Thu, 14 Sep 2023 15:50:26 -0400
Subject: [PATCH 07/32] TODO

---
 src/mantle/database/query/concerns/trait-queries-dates.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/mantle/database/query/concerns/trait-queries-dates.php b/src/mantle/database/query/concerns/trait-queries-dates.php
index 3fb96588..fbe6c9a6 100644
--- a/src/mantle/database/query/concerns/trait-queries-dates.php
+++ b/src/mantle/database/query/concerns/trait-queries-dates.php
@@ -18,6 +18,8 @@
  *
  * @link https://developer.wordpress.org/reference/classes/wp_query/#date-parameters
  *
+ * @todo Add support for more complex date queries (mixing AND/OR, etc.).
+ *
  * @mixin \Mantle\Database\Query\Post_Query_Builder
  */
 trait Queries_Dates {

From d00a643d7a1b41165e7b75b680f67848d72e84a1 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Thu, 14 Sep 2023 15:53:56 -0400
Subject: [PATCH 08/32] PHPCS fix

---
 .../database/query/class-post-query-builder.php  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/mantle/database/query/class-post-query-builder.php b/src/mantle/database/query/class-post-query-builder.php
index ca88e7b6..c5ad15ae 100644
--- a/src/mantle/database/query/class-post-query-builder.php
+++ b/src/mantle/database/query/class-post-query-builder.php
@@ -39,16 +39,16 @@ class Post_Query_Builder extends Builder {
 	 * @var array
 	 */
 	protected array $query_aliases = [
-		'date_gmt'    => 'post_date_gmt',
-		'date_utc'    => 'post_date_gmt',
-		'date'        => 'post_date',
-		'id'          => 'p',
+		'date_gmt'     => 'post_date_gmt',
+		'date_utc'     => 'post_date_gmt',
+		'date'         => 'post_date',
+		'id'           => 'p',
 		'modified_gmt' => 'post_modified_gmt',
 		'modified_utc' => 'post_modified_gmt',
-		'modified'    => 'post_modified',
-		'post_author' => 'author',
-		'post_name'   => 'name',
-		'slug'        => 'name',
+		'modified'     => 'post_modified',
+		'post_author'  => 'author',
+		'post_name'    => 'name',
+		'slug'         => 'name',
 	];
 
 	/**

From 151dd5881ec8120f50317e11a9854a0b4a27da24 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Thu, 14 Sep 2023 15:57:44 -0400
Subject: [PATCH 09/32] Adding the doc blocks for the date query

---
 src/mantle/database/model/class-post.php         | 12 ++++++++++++
 tests/database/query/test-post-query-builder.php |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/mantle/database/model/class-post.php b/src/mantle/database/model/class-post.php
index 65eb4157..dd9773a9 100644
--- a/src/mantle/database/model/class-post.php
+++ b/src/mantle/database/model/class-post.php
@@ -67,6 +67,18 @@
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> where_raw( array|string $column, ?string $operator = null, mixed $value = null, string $boolean = 'AND' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> orWhereRaw( array|string $column, ?string $operator = null, mixed $value = null, string $boolean = 'AND' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> or_where_raw( array|string $column, ?string $operator = null, mixed $value = null, string $boolean = 'AND' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereDate( DateTimeInterface|int|string $date, string $compare = '=', string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereUtcDate( DateTimeInterface|int|string $date, string $compare = '=' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereModifiedDate( DateTimeInterface|int|string $date, string $compare = '=' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereModifiedUtcDate( DateTimeInterface|int|string $date, string $compare = '=' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThan( DateTimeInterface|int $date )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThanOrEqualTo( DateTimeInterface|int $date )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> older_than( DateTimeInterface|int $date )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> older_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newerThan( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newerThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newer_than( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newer_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' )
  */
 class Post extends Model implements Contracts\Database\Core_Object, Contracts\Database\Model_Meta, Contracts\Database\Updatable {
 	use Events\Post_Events,
diff --git a/tests/database/query/test-post-query-builder.php b/tests/database/query/test-post-query-builder.php
index c735ad73..73c0ba32 100644
--- a/tests/database/query/test-post-query-builder.php
+++ b/tests/database/query/test-post-query-builder.php
@@ -541,7 +541,7 @@ public function test_post_by_date() {
 
 		$this->assertEquals(
 			$old_post_id,
-			Testable_Post::query()->whereDate( $old_date )->first()?->id,
+			Testable_Post::whereDate( $old_date )->first()?->id,
 		);
 
 		$this->assertEquals(

From cab1b3ada306a08167a6b6cb1975dc255bf4d4ee Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Wed, 20 Sep 2023 16:39:33 -0400
Subject: [PATCH 10/32] Ensure all methods have parity and can pass the column

---
 src/mantle/application/autoload.php           | 18 +++++++++
 .../query/concerns/trait-queries-dates.php    | 39 +++++++++++++++----
 2 files changed, 49 insertions(+), 8 deletions(-)

diff --git a/src/mantle/application/autoload.php b/src/mantle/application/autoload.php
index 34420cc2..e7d49d7d 100644
--- a/src/mantle/application/autoload.php
+++ b/src/mantle/application/autoload.php
@@ -82,3 +82,21 @@ function storage_path( string $path = '' ): string {
 		return app()->get_storage_path( $path );
 	}
 }
+
+if ( ! function_exists( 'now' ) ) {
+	/**
+	 * Create a new Carbon instance for the current time.
+	 *
+	 * @todo Allow this to be faked and mocked during testing.
+	 *
+	 * @param DateTimeZone|string|null $tz Timezone.
+	 * @return Carbon\Carbon
+	 */
+	function now( \DateTimeZone|string|null $tz = null ): Carbon\Carbon {
+		if ( ! $tz ) {
+			$tz = function_exists( 'wp_timezone' ) ? wp_timezone() : new DateTimeZone( 'UTC' );
+		}
+
+		return Carbon\Carbon::now( $tz );
+	}
+}
diff --git a/src/mantle/database/query/concerns/trait-queries-dates.php b/src/mantle/database/query/concerns/trait-queries-dates.php
index fbe6c9a6..7e269e1a 100644
--- a/src/mantle/database/query/concerns/trait-queries-dates.php
+++ b/src/mantle/database/query/concerns/trait-queries-dates.php
@@ -102,31 +102,44 @@ public function whereModifiedUtcDate( DateTimeInterface|int|string $date, string
 	/**
 	 * Query for objects older than the given date.
 	 *
-	 * @param DateTimeInterface|int $date
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
 	 * @return static
 	 */
-	public function olderThan( DateTimeInterface|int $date ): static {
-		return $this->whereDate( $date, '<' );
+	public function olderThan( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '<', $column );
 	}
 
 	/**
 	 * Query for objects older than or equal to the given date.
 	 *
-	 * @param DateTimeInterface|int $date
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function olderThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '<=', $column );
+	}
+
+	/**
+	 * Query for objects older than or equal to now.
+	 *
+	 * @param string $column Column to compare against.
 	 * @return static
 	 */
-	public function olderThanOrEqualTo( DateTimeInterface|int $date ): static {
-		return $this->whereDate( $date, '<=' );
+	public function olderThanNow( string $column = 'post_date' ): static {
+		return $this->olderThanOrEqualTo( now(), $column );
 	}
 
 	/**
 	 * Alias for olderThan().
 	 *
 	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
 	 * @return static
 	 */
-	public function older_than( DateTimeInterface|int $date ): static {
-		return $this->olderThan( $date );
+	public function older_than( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->olderThan( $date, $column );
 	}
 
 	/**
@@ -151,6 +164,16 @@ public function newerThan( DateTimeInterface|int $date, string $column = 'post_d
 		return $this->whereDate( $date, '>', $column );
 	}
 
+	/**
+	 * Query for objects newer than now (in the future from now).
+	 *
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function newerThanNow( string $column = 'post_date' ): static {
+		return $this->newerThan( now(), $column );
+	}
+
 	/**
 	 * Query for objects newer than or equal to the given date.
 	 *

From bcfab3efe1a8490a1b2a75307a4989a082cbbd74 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Fri, 22 Sep 2023 15:30:29 -0400
Subject: [PATCH 11/32] Fixing @methods

---
 src/mantle/database/model/class-post.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mantle/database/model/class-post.php b/src/mantle/database/model/class-post.php
index dd9773a9..fc3c7021 100644
--- a/src/mantle/database/model/class-post.php
+++ b/src/mantle/database/model/class-post.php
@@ -71,9 +71,9 @@
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereUtcDate( DateTimeInterface|int|string $date, string $compare = '=' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereModifiedDate( DateTimeInterface|int|string $date, string $compare = '=' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereModifiedUtcDate( DateTimeInterface|int|string $date, string $compare = '=' )
- * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThan( DateTimeInterface|int $date )
- * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThanOrEqualTo( DateTimeInterface|int $date )
- * @method static \Mantle\Database\Query\Post_Query_Builder<static> older_than( DateTimeInterface|int $date )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThan( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> older_than( DateTimeInterface|int $date, string $column = 'post_date' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> older_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> newerThan( DateTimeInterface|int $date, string $column = 'post_date' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> newerThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' )

From 7075e2e34a54eef11680d08617196851bfb54005 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Fri, 22 Sep 2023 15:35:11 -0400
Subject: [PATCH 12/32] Adding date query builder for posts (#454)

* WIP

* Adding in the basis of the date query

* Ensure where() can be used still

* TODO

* PHPCS fix

* Adding the doc blocks for the date query

* Ensure all methods have parity and can pass the column

* Fixing @methods
---
 src/mantle/application/autoload.php           |  18 ++
 src/mantle/database/model/class-post.php      |  12 +
 src/mantle/database/query/class-builder.php   |   5 +
 .../query/class-post-query-builder.php        |  18 +-
 .../query/concerns/trait-queries-dates.php    | 303 ++++++++++++++++++
 .../concerns/trait-wordpress-state.php        |  23 +-
 .../query/test-post-query-builder.php         | 108 +++++++
 7 files changed, 475 insertions(+), 12 deletions(-)
 create mode 100644 src/mantle/database/query/concerns/trait-queries-dates.php

diff --git a/src/mantle/application/autoload.php b/src/mantle/application/autoload.php
index 34420cc2..e7d49d7d 100644
--- a/src/mantle/application/autoload.php
+++ b/src/mantle/application/autoload.php
@@ -82,3 +82,21 @@ function storage_path( string $path = '' ): string {
 		return app()->get_storage_path( $path );
 	}
 }
+
+if ( ! function_exists( 'now' ) ) {
+	/**
+	 * Create a new Carbon instance for the current time.
+	 *
+	 * @todo Allow this to be faked and mocked during testing.
+	 *
+	 * @param DateTimeZone|string|null $tz Timezone.
+	 * @return Carbon\Carbon
+	 */
+	function now( \DateTimeZone|string|null $tz = null ): Carbon\Carbon {
+		if ( ! $tz ) {
+			$tz = function_exists( 'wp_timezone' ) ? wp_timezone() : new DateTimeZone( 'UTC' );
+		}
+
+		return Carbon\Carbon::now( $tz );
+	}
+}
diff --git a/src/mantle/database/model/class-post.php b/src/mantle/database/model/class-post.php
index 65eb4157..fc3c7021 100644
--- a/src/mantle/database/model/class-post.php
+++ b/src/mantle/database/model/class-post.php
@@ -67,6 +67,18 @@
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> where_raw( array|string $column, ?string $operator = null, mixed $value = null, string $boolean = 'AND' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> orWhereRaw( array|string $column, ?string $operator = null, mixed $value = null, string $boolean = 'AND' )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> or_where_raw( array|string $column, ?string $operator = null, mixed $value = null, string $boolean = 'AND' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereDate( DateTimeInterface|int|string $date, string $compare = '=', string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereUtcDate( DateTimeInterface|int|string $date, string $compare = '=' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereModifiedDate( DateTimeInterface|int|string $date, string $compare = '=' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereModifiedUtcDate( DateTimeInterface|int|string $date, string $compare = '=' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThan( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> olderThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> older_than( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> older_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newerThan( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newerThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newer_than( DateTimeInterface|int $date, string $column = 'post_date' )
+ * @method static \Mantle\Database\Query\Post_Query_Builder<static> newer_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' )
  */
 class Post extends Model implements Contracts\Database\Core_Object, Contracts\Database\Model_Meta, Contracts\Database\Updatable {
 	use Events\Post_Events,
diff --git a/src/mantle/database/query/class-builder.php b/src/mantle/database/query/class-builder.php
index 401cf85c..da6c1779 100644
--- a/src/mantle/database/query/class-builder.php
+++ b/src/mantle/database/query/class-builder.php
@@ -302,6 +302,11 @@ public function where( array|string $attribute, mixed $value = '' ): static {
 
 		$attribute = $this->resolve_attribute( $attribute );
 
+		// Pass date attributes to the date query builder if available.
+		if ( method_exists( $this, 'whereDate' ) && in_array( $attribute, [ 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt' ], true ) ) {
+			return $this->whereDate( $value, '=', $attribute );
+		}
+
 		$this->wheres[ $attribute ] = $value;
 
 		return $this;
diff --git a/src/mantle/database/query/class-post-query-builder.php b/src/mantle/database/query/class-post-query-builder.php
index 08f2158f..c5ad15ae 100644
--- a/src/mantle/database/query/class-post-query-builder.php
+++ b/src/mantle/database/query/class-post-query-builder.php
@@ -9,6 +9,7 @@
 namespace Mantle\Database\Query;
 
 use Mantle\Database\Model\Term;
+use Mantle\Database\Query\Concerns\Queries_Dates;
 use Mantle\Support\Helpers;
 use Mantle\Support\Collection;
 use WP_Term;
@@ -30,7 +31,7 @@
  * @method \Mantle\Database\Query\Post_Query_Builder<TModel> whereType( string $type )
  */
 class Post_Query_Builder extends Builder {
-	use Queries_Relationships;
+	use Queries_Dates, Queries_Relationships;
 
 	/**
 	 * Query Variable Aliases
@@ -38,10 +39,16 @@ class Post_Query_Builder extends Builder {
 	 * @var array
 	 */
 	protected array $query_aliases = [
-		'id'          => 'p',
-		'post_author' => 'author',
-		'post_name'   => 'name',
-		'slug'        => 'name',
+		'date_gmt'     => 'post_date_gmt',
+		'date_utc'     => 'post_date_gmt',
+		'date'         => 'post_date',
+		'id'           => 'p',
+		'modified_gmt' => 'post_modified_gmt',
+		'modified_utc' => 'post_modified_gmt',
+		'modified'     => 'post_modified',
+		'post_author'  => 'author',
+		'post_name'    => 'name',
+		'slug'         => 'name',
 	];
 
 	/**
@@ -121,6 +128,7 @@ public function get_query_args(): array {
 				'suppress_filters'    => false,
 				'tax_query'           => $this->tax_query, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query
 			],
+			$this->get_date_query_args(),
 			$this->wheres,
 		);
 	}
diff --git a/src/mantle/database/query/concerns/trait-queries-dates.php b/src/mantle/database/query/concerns/trait-queries-dates.php
new file mode 100644
index 00000000..7e269e1a
--- /dev/null
+++ b/src/mantle/database/query/concerns/trait-queries-dates.php
@@ -0,0 +1,303 @@
+<?php
+/**
+ * Queries_Dates trait file
+ *
+ * phpcs:disable WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Database\Query\Concerns;
+
+use Carbon\Carbon;
+use DateTimeInterface;
+use InvalidArgumentException;
+
+/**
+ * Logic to query posts by dates.
+ *
+ * @link https://developer.wordpress.org/reference/classes/wp_query/#date-parameters
+ *
+ * @todo Add support for more complex date queries (mixing AND/OR, etc.).
+ *
+ * @mixin \Mantle\Database\Query\Post_Query_Builder
+ */
+trait Queries_Dates {
+	/**
+	 * Date constraints to apply to the query.
+	 *
+	 * @var array<int, array{date: DateTimeInterface|int|string, compare: string, column: string}>
+	 */
+	protected array $date_constraints = [];
+
+	/**
+	 * The valid comparison operators for a date query.
+	 *
+	 * @var array
+	 */
+	protected array $date_operators = [
+		'=',
+		'!=',
+		'>',
+		'>=',
+		'<',
+		'<=',
+	];
+
+	/**
+	 * Add a date query for a date to the query.
+	 *
+	 * Defaults to comparing against the post published date.
+	 *
+	 * @throws InvalidArgumentException If an invalid comparison operator is provided.
+	 *
+	 * @param DateTimeInterface|int|string $date
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @param string                       $column Column to compare against, defaults to 'post_date'.
+	 * @return static
+	 */
+	public function whereDate( DateTimeInterface|int|string $date, string $compare = '=', string $column = 'post_date' ): static {
+		if ( ! in_array( $compare, $this->date_operators, true ) ) {
+			throw new InvalidArgumentException( 'Invalid date comparison operator: ' . $compare );
+		}
+
+		$this->date_constraints[] = compact( 'date', 'compare', 'column' );
+
+		return $this;
+	}
+
+	/**
+	 * Add a date query for the UTC publish date to the query.
+	 *
+	 * @param DateTimeInterface|int|string $date Date to compare against.
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @return static
+	 */
+	public function whereUtcDate( DateTimeInterface|int|string $date, string $compare = '=' ): static {
+		return $this->whereDate( $date, $compare, 'post_date_gmt' );
+	}
+
+	/**
+	 * Add a date query for the modified date to the query.
+	 *
+	 * @param DateTimeInterface|int|string $date Date to compare against.
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @return static
+	 */
+	public function whereModifiedDate( DateTimeInterface|int|string $date, string $compare = '=' ): static {
+		return $this->whereDate( $date, $compare, 'post_modified' );
+	}
+
+	/**
+	 * Add a date query for the modified UTC date to the query.
+	 *
+	 * @param DateTimeInterface|int|string $date Date to compare against.
+	 * @param string                       $compare Comparison operator, defaults to '='.
+	 * @return static
+	 */
+	public function whereModifiedUtcDate( DateTimeInterface|int|string $date, string $compare = '=' ): static {
+		return $this->whereDate( $date, $compare, 'post_modified_gmt' );
+	}
+
+	/**
+	 * Query for objects older than the given date.
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function olderThan( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '<', $column );
+	}
+
+	/**
+	 * Query for objects older than or equal to the given date.
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function olderThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '<=', $column );
+	}
+
+	/**
+	 * Query for objects older than or equal to now.
+	 *
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function olderThanNow( string $column = 'post_date' ): static {
+		return $this->olderThanOrEqualTo( now(), $column );
+	}
+
+	/**
+	 * Alias for olderThan().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function older_than( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->olderThan( $date, $column );
+	}
+
+	/**
+	 * Alias for olderThanOrEqualTo().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function older_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '<=', $column );
+	}
+
+	/**
+	 * Query for objects newer than the given date.
+	 *
+	 * @param DateTimeInterface|int $date
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function newerThan( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '>', $column );
+	}
+
+	/**
+	 * Query for objects newer than now (in the future from now).
+	 *
+	 * @param string $column Column to compare against.
+	 * @return static
+	 */
+	public function newerThanNow( string $column = 'post_date' ): static {
+		return $this->newerThan( now(), $column );
+	}
+
+	/**
+	 * Query for objects newer than or equal to the given date.
+	 *
+	 * @param DateTimeInterface|int $date
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function newerThanOrEqualTo( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->whereDate( $date, '>=', $column );
+	}
+
+	/**
+	 * Alias for newerThan().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function newer_than( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->newerThan( $date, $column );
+	}
+
+	/**
+	 * Alias for newerThanOrEqualTo().
+	 *
+	 * @param DateTimeInterface|int $date Date to compare against.
+	 * @param string                $column Column to compare against.
+	 * @return static
+	 */
+	public function newer_than_or_equal_to( DateTimeInterface|int $date, string $column = 'post_date' ): static {
+		return $this->newerThanOrEqualTo( $date, $column );
+	}
+
+	/**
+	 * Calculate the arguments for the date query to pass to either WP_Query.
+	 *
+	 * @return array
+	 */
+	protected function get_date_query_args(): array {
+		if ( empty( $this->date_constraints ) ) {
+			return [];
+		}
+
+		$date_query = [];
+
+		foreach ( $this->date_constraints as $constraint ) {
+			$date = $constraint['date'];
+
+			if ( is_int( $date ) ) {
+				$date = Carbon::createFromTimestamp( $date, wp_timezone() );
+			} elseif ( is_string( $date ) ) {
+				$date = Carbon::parse( $date, wp_timezone() );
+			} elseif ( $date instanceof DateTimeInterface ) {
+				$date = Carbon::instance( $date );
+			}
+
+			switch ( $constraint['compare'] ) {
+				case '<':
+					$date_query[] = [
+						'column' => $constraint['column'],
+						'before' => $date->toDateTimeString(),
+					];
+					break;
+
+				case '<=':
+					$date_query[] = [
+						'column'    => $constraint['column'],
+						'before'    => $date->toDateTimeString(),
+						'inclusive' => true,
+					];
+					break;
+
+				case '>':
+					$date_query[] = [
+						'column' => $constraint['column'],
+						'after'  => $date->toDateTimeString(),
+					];
+					break;
+
+				case '>=':
+					$date_query[] = [
+						'column'    => $constraint['column'],
+						'after'     => $date->toDateTimeString(),
+						'inclusive' => true,
+					];
+					break;
+
+				// TODO: Review if a query for a specific date can be improved.
+				case '=':
+					$date_query[] = [
+						'relation' => 'and',
+						[
+							'column'    => $constraint['column'],
+							'before'    => $date->toDateTimeString(),
+							'inclusive' => true,
+						],
+						[
+							'column'    => $constraint['column'],
+							'after'     => $date->toDateTimeString(),
+							'inclusive' => true,
+						],
+					];
+					break;
+
+				case '!=':
+					$date_query[] = [
+						'relation' => 'or',
+						[
+							'column'    => $constraint['column'],
+							'before'    => $date->toDateTimeString(),
+							'inclusive' => false,
+						],
+						[
+							'column'    => $constraint['column'],
+							'after'     => $date->toDateTimeString(),
+							'inclusive' => false,
+						],
+					];
+					break;
+			}
+		}
+
+		return [
+			'date_query' => $date_query,
+		];
+	}
+}
diff --git a/src/mantle/testing/concerns/trait-wordpress-state.php b/src/mantle/testing/concerns/trait-wordpress-state.php
index bdb34666..4b38229a 100644
--- a/src/mantle/testing/concerns/trait-wordpress-state.php
+++ b/src/mantle/testing/concerns/trait-wordpress-state.php
@@ -7,7 +7,11 @@
 
 namespace Mantle\Testing\Concerns;
 
+use Carbon\Carbon;
+use DateTimeInterface;
+use Mantle\Database\Model\Post;
 use Mantle\Testing\Utils;
+use WP_Post;
 
 /**
  * This trait includes functionality for controlling WordPress state during
@@ -159,22 +163,27 @@ public function set_permalink_structure( $structure = '' ) {
 	 *
 	 * @global \wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int    $post_id Post ID.
-	 * @param string $date    Post date, in the format YYYY-MM-DD HH:MM:SS.
+	 * @param WP_Post|Post|int         $post Post ID or post object.
+	 * @param DateTimeInterface|string $date Date object or string to update the
+	 *                                       post with. If a string is passed it
+	 *                                       is assumed to be local timezone.
 	 * @return int|false 1 on success, or false on error.
 	 */
-	protected function update_post_modified( $post_id, $date ) {
+	protected function update_post_modified( WP_Post|Post|int $post, DateTimeInterface|string $date ) {
 		global $wpdb;
 
+		$post = is_object( $post ) ? $post->ID : $post;
+		$date = $date instanceof DateTimeInterface ? Carbon::instance( $date ) : Carbon::parse( $date, wp_timezone() );
+
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery
 		$update = $wpdb->update(
 			$wpdb->posts,
 			[
-				'post_modified'     => $date,
-				'post_modified_gmt' => $date,
+				'post_modified'     => $date->setTimezone( wp_timezone() )->format( 'Y-m-d H:i:s' ),
+				'post_modified_gmt' => $date->setTimezone( new \DateTimeZone( 'UTC' ) )->format( 'Y-m-d H:i:s' ),
 			],
 			[
-				'ID' => $post_id,
+				'ID' => $post,
 			],
 			[
 				'%s',
@@ -185,7 +194,7 @@ protected function update_post_modified( $post_id, $date ) {
 			]
 		);
 
-		clean_post_cache( $post_id );
+		clean_post_cache( $post );
 
 		return $update;
 	}
diff --git a/tests/database/query/test-post-query-builder.php b/tests/database/query/test-post-query-builder.php
index c0fa3a35..73c0ba32 100644
--- a/tests/database/query/test-post-query-builder.php
+++ b/tests/database/query/test-post-query-builder.php
@@ -18,7 +18,9 @@ class Test_Post_Query_Builder extends Framework_Test_Case {
 
 	protected function setUp(): void {
 		parent::setUp();
+
 		Utils::delete_all_data();
+
 		register_post_type( Another_Testable_Post::get_object_name() );
 	}
 
@@ -525,6 +527,112 @@ public function test_count() {
 		$this->assertEquals( 1, Testable_Post::whereIn( 'id', [ $post_id ] )->count() );
 	}
 
+	public function test_post_by_date() {
+		$old_date = Carbon::now( wp_timezone() )->subMonth();
+		$now      = Carbon::now( wp_timezone() );
+
+		$old_post_id = Testable_Post::factory()->create( [
+			'post_date' => $old_date->toDateTimeString(),
+		] );
+
+		$now_post_id = Testable_Post::factory()->create( [
+			'post_date' => $now->toDateTimeString(),
+		] );
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::whereDate( $old_date )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereDate( $now )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->where( 'date', $old_date )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereDate( $old_date, '!=' )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->whereDate( $now, '!=' )->first()?->id,
+		);
+	}
+
+	public function test_post_by_modified_date() {
+		$old_date = Carbon::now( wp_timezone() )->subMonth();
+		$now      = Carbon::now( wp_timezone() );
+
+		$old_post_id = Testable_Post::factory()->create();
+		$now_post_id = Testable_Post::factory()->create();
+
+		$this->update_post_modified( $old_post_id, $old_date );
+		$this->update_post_modified( $now_post_id, $now );
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->whereModifiedDate( $old_date )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereModifiedDate( $now )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$now_post_id,
+			Testable_Post::query()->whereModifiedDate( $old_date, '!=' )->first()?->id,
+		);
+
+		$this->assertEquals(
+			$old_post_id,
+			Testable_Post::query()->whereModifiedDate( $now, '!=' )->first()?->id,
+		);
+	}
+
+	/**
+	 * @dataProvider date_comparison_provider
+	 */
+	public function test_date_comparisons( int $expected, string $method, array $args ) {
+		$start = Carbon::now( wp_timezone() )->subMonth()->startOfDay();
+
+		static::factory()->post->create_ordered_set( 20, [], $start->clone() );
+
+		$this->assertEquals(
+			$expected,
+			Testable_Post::query()->{$method}( ...$args )->count(),
+		);
+	}
+
+	public static function date_comparison_provider(): array {
+		$start = Carbon::now( wp_timezone() )->subMonth()->startOfDay();
+
+		return [
+			// Older than now should return all posts.
+			'older_than_now' => [ 20, 'olderThan', [ Carbon::now( wp_timezone() ) ] ],
+			// Older than the start date should return no posts.
+			'older_than_start' => [ 0, 'olderThan', [ $start ] ],
+			// Older than or equal to the start date should return the first post.
+			'older_than_or_equal_to_start' => [ 1, 'olderThanOrEqualTo', [ $start ] ],
+			// Older than 5 hrs from start should return 5 posts.
+			'older_than_5_hrs' => [ 5, 'olderThan', [ $start->clone()->addHours( 5 ) ] ],
+			// Newer than 5 hrs from start should return 14 posts.
+			'newer_than_5_hrs' => [ 14, 'newerThan', [ $start->clone()->addHours( 5 ) ] ],
+			// Newer than or equal to 5 hrs from start should return 15 posts.
+			'newer_than_or_equal_to_5_hrs' => [ 15, 'newerThanOrEqualTo', [ $start->clone()->addHours( 5 ) ] ],
+			// Older than the middle post should return 10 posts.
+			'older_than_middle' => [ 10, 'olderThan', [ $start->clone()->addHours( 10 ) ] ],
+			// Newer than the middle post should return 10 posts.
+			'newer_than_middle' => [ 10, 'newerThanOrEqualTo', [ $start->clone()->addHours( 10 ) ] ],
+		];
+	}
+
 	/**
 	 * Get a random post ID, ensures the post ID is not the last in the set.
 	 *

From f99332dcb162907c5aadf5baa7c1280a9c9444cf Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Fri, 29 Sep 2023 15:48:13 -0400
Subject: [PATCH 13/32] Change the composer type to library for all packages

---
 src/mantle/application/composer.json   | 2 +-
 src/mantle/assets/composer.json        | 2 +-
 src/mantle/auth/composer.json          | 2 +-
 src/mantle/blocks/composer.json        | 2 +-
 src/mantle/cache/composer.json         | 2 +-
 src/mantle/config/composer.json        | 2 +-
 src/mantle/console/composer.json       | 2 +-
 src/mantle/container/composer.json     | 2 +-
 src/mantle/contracts/composer.json     | 2 +-
 src/mantle/database/composer.json      | 2 +-
 src/mantle/events/composer.json        | 2 +-
 src/mantle/facade/composer.json        | 2 +-
 src/mantle/faker/composer.json         | 2 +-
 src/mantle/filesystem/composer.json    | 2 +-
 src/mantle/http-client/composer.json   | 2 +-
 src/mantle/http/composer.json          | 2 +-
 src/mantle/log/composer.json           | 2 +-
 src/mantle/new-relic/composer.json     | 2 +-
 src/mantle/query-monitor/composer.json | 2 +-
 src/mantle/queue/composer.json         | 2 +-
 src/mantle/rest-api/composer.json      | 2 +-
 src/mantle/scheduling/composer.json    | 2 +-
 src/mantle/support/composer.json       | 2 +-
 src/mantle/testing/composer.json       | 2 +-
 src/mantle/testkit/composer.json       | 2 +-
 src/mantle/view/composer.json          | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/mantle/application/composer.json b/src/mantle/application/composer.json
index 96348f72..af2b9b94 100644
--- a/src/mantle/application/composer.json
+++ b/src/mantle/application/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/application",
     "description": "The Mantle Framework Application Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/assets/composer.json b/src/mantle/assets/composer.json
index 33631fb7..23467eb3 100644
--- a/src/mantle/assets/composer.json
+++ b/src/mantle/assets/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/assets",
     "description": "The Mantle Framework Asset Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/auth/composer.json b/src/mantle/auth/composer.json
index 1acfa867..eb7291e5 100644
--- a/src/mantle/auth/composer.json
+++ b/src/mantle/auth/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/auth",
     "description": "The Mantle Framework Auth Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/blocks/composer.json b/src/mantle/blocks/composer.json
index 8b1703a8..f7adf7f5 100644
--- a/src/mantle/blocks/composer.json
+++ b/src/mantle/blocks/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/blocks",
     "description": "The Mantle Framework Blocks Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/cache/composer.json b/src/mantle/cache/composer.json
index 32ead84b..0f19d55f 100644
--- a/src/mantle/cache/composer.json
+++ b/src/mantle/cache/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/cache",
     "description": "The Mantle Framework Cache Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/config/composer.json b/src/mantle/config/composer.json
index da9d3d14..769be096 100644
--- a/src/mantle/config/composer.json
+++ b/src/mantle/config/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/config",
     "description": "The Mantle Framework Config Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/console/composer.json b/src/mantle/console/composer.json
index f7bc086f..01dfce03 100644
--- a/src/mantle/console/composer.json
+++ b/src/mantle/console/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/console",
     "description": "The Mantle Framework Console Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/container/composer.json b/src/mantle/container/composer.json
index 66f631d4..c3aa2104 100644
--- a/src/mantle/container/composer.json
+++ b/src/mantle/container/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/container",
     "description": "The Mantle Framework Container Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/contracts/composer.json b/src/mantle/contracts/composer.json
index 6e0dd1d0..2d24d9b4 100644
--- a/src/mantle/contracts/composer.json
+++ b/src/mantle/contracts/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/contracts",
     "description": "The Mantle Framework Contracts Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/database/composer.json b/src/mantle/database/composer.json
index 218f8076..f5ee6edc 100644
--- a/src/mantle/database/composer.json
+++ b/src/mantle/database/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/database",
     "description": "The Mantle Framework Database Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/events/composer.json b/src/mantle/events/composer.json
index 41fbaab1..04f0cae1 100644
--- a/src/mantle/events/composer.json
+++ b/src/mantle/events/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/events",
     "description": "The Mantle Framework Events Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/facade/composer.json b/src/mantle/facade/composer.json
index e18192c4..c13afa74 100644
--- a/src/mantle/facade/composer.json
+++ b/src/mantle/facade/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/facade",
     "description": "The Mantle Framework Facade Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/faker/composer.json b/src/mantle/faker/composer.json
index d787bd33..b9b983ad 100644
--- a/src/mantle/faker/composer.json
+++ b/src/mantle/faker/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/faker",
     "description": "The Mantle Framework Faker Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/filesystem/composer.json b/src/mantle/filesystem/composer.json
index 81458456..a98a2f14 100644
--- a/src/mantle/filesystem/composer.json
+++ b/src/mantle/filesystem/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/filesystem",
     "description": "The Mantle Framework Filesystem Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/http-client/composer.json b/src/mantle/http-client/composer.json
index c1a0e710..bc39b927 100644
--- a/src/mantle/http-client/composer.json
+++ b/src/mantle/http-client/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/http-client",
     "description": "The Mantle Framework Http Client Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/wp-concurrent-remote-requests": "^1.0.2",
diff --git a/src/mantle/http/composer.json b/src/mantle/http/composer.json
index 6a1c4af4..d2013e91 100644
--- a/src/mantle/http/composer.json
+++ b/src/mantle/http/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/http",
     "description": "The Mantle Framework Http Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "illuminate/view": "^9.52.15",
diff --git a/src/mantle/log/composer.json b/src/mantle/log/composer.json
index f9a713a5..101393c4 100644
--- a/src/mantle/log/composer.json
+++ b/src/mantle/log/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/log",
     "description": "The Mantle Framework Log Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/new-relic/composer.json b/src/mantle/new-relic/composer.json
index 024b1d47..105d2f85 100644
--- a/src/mantle/new-relic/composer.json
+++ b/src/mantle/new-relic/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/new-relic",
     "description": "The Mantle Framework New Relic Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/query-monitor/composer.json b/src/mantle/query-monitor/composer.json
index 05b8bc0c..67cdbd05 100644
--- a/src/mantle/query-monitor/composer.json
+++ b/src/mantle/query-monitor/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/query-monitor",
     "description": "The Mantle Framework Query Monitor Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/queue/composer.json b/src/mantle/queue/composer.json
index 68874ed5..b8dd169a 100644
--- a/src/mantle/queue/composer.json
+++ b/src/mantle/queue/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/queue",
     "description": "The Mantle Framework Queue Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/rest-api/composer.json b/src/mantle/rest-api/composer.json
index e0375b7b..d467ecaf 100644
--- a/src/mantle/rest-api/composer.json
+++ b/src/mantle/rest-api/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/rest-api",
     "description": "The Mantle Framework REST API Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/scheduling/composer.json b/src/mantle/scheduling/composer.json
index 150201d2..2ca5d600 100644
--- a/src/mantle/scheduling/composer.json
+++ b/src/mantle/scheduling/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/scheduling",
     "description": "The Mantle Framework Scheduling Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/support/composer.json b/src/mantle/support/composer.json
index daa6e599..c42a6e30 100644
--- a/src/mantle/support/composer.json
+++ b/src/mantle/support/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/support",
     "description": "The Mantle Framework Support Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/testing/composer.json b/src/mantle/testing/composer.json
index 92628574..6b8f9083 100644
--- a/src/mantle/testing/composer.json
+++ b/src/mantle/testing/composer.json
@@ -2,7 +2,7 @@
     "name": "mantle-framework/testing",
     "description": "The Mantle Framework Testing Package",
     "keywords": ["testing", "mantle"],
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/testkit/composer.json b/src/mantle/testkit/composer.json
index 8a87bf62..5049aa74 100644
--- a/src/mantle/testkit/composer.json
+++ b/src/mantle/testkit/composer.json
@@ -2,7 +2,7 @@
     "name": "mantle-framework/testkit",
     "description": "The Mantle Framework Teskit Package",
     "keywords": ["testing", "mantle"],
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
diff --git a/src/mantle/view/composer.json b/src/mantle/view/composer.json
index 1a7ddb8f..2d53342e 100644
--- a/src/mantle/view/composer.json
+++ b/src/mantle/view/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "mantle-framework/view",
     "description": "The Mantle Framework View Package",
-    "type": "project",
+    "type": "library",
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",

From 9fdd5169cd1bc58c8b067cd15b59cba9b05c1b2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Sep 2023 16:38:45 -0400
Subject: [PATCH 14/32] Update phpstan/phpstan requirement from 1.10.33 to
 1.10.35 (#457)

Updates the requirements on [phpstan/phpstan](https://github.com/phpstan/phpstan) to permit the latest version.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.33...1.10.35)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1b14130d..16c776ce 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "mockery/mockery": "^1.6.6",
         "php-stubs/wp-cli-stubs": "^2.8",
         "phpstan/phpdoc-parser": "^1.23.1",
-        "phpstan/phpstan": "1.10.33",
+        "phpstan/phpstan": "1.10.35",
         "phpunit/phpunit": "^9.6.10",
         "predis/predis": "^2.2.0",
         "squizlabs/php_codesniffer": "^3.7",

From 7cb76f596ea5b5a90229818aa0abcea104ebaa39 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Mon, 2 Oct 2023 13:05:42 -0400
Subject: [PATCH 15/32] Adding a database collection with found rows (#459)

* Adding a database collection and passing along the found_rows to the collection

* Allow the value to be passed
---
 src/mantle/database/query/class-builder.php   |  21 +-
 .../database/query/class-collection.php       | 190 ++++++++++++++++++
 .../query/class-post-query-builder.php        |  53 +++--
 .../query/class-term-query-builder.php        |  18 +-
 src/mantle/support/class-collection.php       |   6 +-
 .../query/test-post-query-builder.php         |  30 +++
 6 files changed, 283 insertions(+), 35 deletions(-)
 create mode 100644 src/mantle/database/query/class-collection.php

diff --git a/src/mantle/database/query/class-builder.php b/src/mantle/database/query/class-builder.php
index da6c1779..969ad838 100644
--- a/src/mantle/database/query/class-builder.php
+++ b/src/mantle/database/query/class-builder.php
@@ -3,7 +3,7 @@
  * Builder class file.
  *
  * phpcs:disable WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
- * phpcs:disable Squiz.Commenting.FunctionComment
+ * phpcs:disable Squiz.Commenting.VariableComment.Missing, Squiz.Commenting.FunctionComment
  * phpcs:disable PEAR.Functions.FunctionCallSignature.CloseBracketLine, PEAR.Functions.FunctionCallSignature.MultipleArguments, PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket
  *
  * @package Mantle
@@ -26,8 +26,6 @@
 use Mantle\Support\Str;
 use Mantle\Support\Traits\Conditionable;
 
-use function Mantle\Support\Helpers\collect;
-
 /**
  * Builder Query Builder
  *
@@ -41,9 +39,9 @@ abstract class Builder {
 	/**
 	 * Model to build on.
 	 *
-	 * @var string[]|string
+	 * @var class-string<TModel>|array<class-string<TModel>>
 	 */
-	protected $model;
+	protected array|string $model;
 
 	/**
 	 * Result limit per-page.
@@ -132,9 +130,9 @@ abstract class Builder {
 	/**
 	 * Storage of the found rows for a query.
 	 *
-	 * @var int
+	 * @var int|null
 	 */
-	protected int $found_rows = 0;
+	protected ?int $found_rows = 0;
 
 	/**
 	 * Relationships to eager load.
@@ -914,16 +912,13 @@ public function __call( $method, $args ) {
 	/**
 	 * Collect all the model object names in an associative Collection.
 	 *
-	 * @return Collection Collection with object names as keys and model
-	 *                    class names as values.
+	 * @return Collection<string, class-string<\Mantle\Database\Model\Model>> Collection of model class names keyed by object name.
 	 */
 	public function get_model_object_names(): Collection {
-		return collect( (array) $this->model )
+		return ( new Collection( (array) $this->model ) ) // @phpstan-ignore-line should return
 			->combine( $this->model )
 			->map(
-				function ( $model ) {
-					return $model::get_object_name();
-				}
+				fn ( $model ) => $model::get_object_name(),
 			)
 			->flip();
 	}
diff --git a/src/mantle/database/query/class-collection.php b/src/mantle/database/query/class-collection.php
new file mode 100644
index 00000000..fa49b958
--- /dev/null
+++ b/src/mantle/database/query/class-collection.php
@@ -0,0 +1,190 @@
+<?php
+/**
+ * Collection class file
+ *
+ * phpcs:disable Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Database\Query;
+
+use Mantle\Database\Model\Model;
+use Mantle\Support\Collection as Base_Collection;
+
+/**
+ * Database Query Collection
+ *
+ * @template TKey of array-key
+ * @template TModel of \Mantle\Database\Model\Model
+ *
+ * @extends \Mantle\Support\Collection<TKey, TModel>
+ */
+class Collection extends Base_Collection {
+	/**
+	 * Total number of rows found for the query.
+	 *
+	 * @var int|null
+	 */
+	public ?int $found_rows = null;
+
+	/**
+	 * Set the total number of rows found for the query.
+	 *
+	 * @param int|null $found_rows Total number of rows found for the query.
+	 * @return static
+	 */
+	public function with_found_rows( ?int $found_rows ): static {
+		$this->found_rows = $found_rows;
+
+		return $this;
+	}
+
+	/**
+	 * Get the total number of rows found for the query.
+	 *
+	 * @return int|null
+	 */
+	public function found_rows(): ?int {
+		return $this->found_rows;
+	}
+
+	/**
+	 * Retrieve the models in the collection.
+	 *
+	 * @return \Mantle\Support\Collection<int, class-string<TModel>>
+	 */
+	public function models(): Base_Collection {
+		return $this->map( fn ( $model ) => $model::class )->values()->unique();
+	}
+
+	/**
+	 * Run a map over each of the items.
+	 *
+	 * @template TMapValue
+	 *
+	 * @param  callable(TModel, TKey): TMapValue $callback The callback to run.
+	 * @return \Mantle\Support\Collection<TKey, TMapValue>|static<TKey, TMapValue>
+	 */
+	public function map( callable $callback ) {
+		$result = parent::map( $callback );
+
+		if ( $result instanceof self ) {
+			$result->with_found_rows( $this->found_rows );
+		}
+
+		return $result->contains( fn ( $item ) => ! $item instanceof Model )
+			? $result->to_base()
+			: $result;
+	}
+
+	/**
+	 * Run an associative map over each of the items.
+	 *
+	 * The callback should return an associative array with a single key/value pair.
+	 *
+	 * @template TMapWithKeysKey of array-key
+	 * @template TMapWithKeysValue
+	 *
+	 * @param  callable(TModel, TKey): array<TMapWithKeysKey, TMapWithKeysValue> $callback The callback to run.
+	 * @return \Mantle\Support\Collection<TMapWithKeysKey, TMapWithKeysValue>|static<TMapWithKeysKey, TMapWithKeysValue>
+	 */
+	public function map_with_keys( callable $callback ) {
+		$result = parent::map_with_keys( $callback );
+
+		if ( $result instanceof self ) {
+			$result->with_found_rows( $this->found_rows );
+		}
+
+		return $result->contains( fn ( $item ) => ! $item instanceof Model )
+			? $result->to_base()
+			: $result;
+	}
+
+	/**
+	 * The following methods are intercepted to always return base collections.
+	 */
+
+	/**
+	 * Count the number of items in the collection by a field or using a callback.
+	 *
+	 * @param  (callable(TModel, TKey): array-key)|string|null $count_by
+	 * @return \Mantle\Support\Collection<array-key, int>
+	 */
+	public function count_by( $count_by = null ) {
+		return $this->to_base()->count_by( $count_by );
+	}
+
+	/**
+	 * Collapse the collection of items into a single array.
+	 *
+	 * @return \Mantle\Support\Collection<int, mixed>
+	 */
+	public function collapse() {
+		return $this->to_base()->collapse();
+	}
+
+	/**
+	 * Get a flattened array of the items in the collection.
+	 *
+	 * @param  int|float $depth
+	 * @return \Mantle\Support\Collection<int, mixed>
+	 */
+	public function flatten( $depth = INF ) {
+		return $this->to_base()->flatten( $depth );
+	}
+
+	/**
+	 * Flip the items in the collection.
+	 *
+	 * @return \Mantle\Support\Collection<int|string, TKey>
+	 */
+	public function flip() {
+		return $this->to_base()->flip();
+	}
+
+	/**
+	 * Get the keys of the collection items.
+	 *
+	 * @return \Mantle\Support\Collection<int, TKey>
+	 */
+	public function keys() {
+		return $this->to_base()->keys();
+	}
+
+	/**
+	 * Pad collection to the specified length with a value.
+	 *
+	 * @template TPadValue
+	 *
+	 * @param  int       $size
+	 * @param  TPadValue $value
+	 * @return \Mantle\Support\Collection<int, TModel|TPadValue>
+	 */
+	public function pad( $size, $value ) {
+		return $this->to_base()->pad( $size, $value );
+	}
+
+	/**
+	 * Get an array with the values of a given key.
+	 *
+	 * @param  string|array<array-key, string> $value
+	 * @param  string|null                     $key
+	 * @return \Mantle\Support\Collection<array-key, mixed>
+	 */
+	public function pluck( $value, $key = null ) {
+		return $this->to_base()->pluck( $value, $key );
+	}
+
+	/**
+	 * Zip the collection together with one or more arrays.
+	 *
+	 * @template TZipValue
+	 *
+	 * @param  \Mantle\Contracts\Support\Arrayable<array-key, TZipValue>|iterable<array-key, TZipValue> ...$items
+	 * @return static<int, static<TKey, TModel|TZipValue>>
+	 */
+	public function zip( ...$items ) { // @phpstan-ignore-line return
+		return $this->to_base()->zip( ...$items );
+	}
+}
diff --git a/src/mantle/database/query/class-post-query-builder.php b/src/mantle/database/query/class-post-query-builder.php
index c5ad15ae..995f4dbd 100644
--- a/src/mantle/database/query/class-post-query-builder.php
+++ b/src/mantle/database/query/class-post-query-builder.php
@@ -11,7 +11,7 @@
 use Mantle\Database\Model\Term;
 use Mantle\Database\Query\Concerns\Queries_Dates;
 use Mantle\Support\Helpers;
-use Mantle\Support\Collection;
+use RuntimeException;
 use WP_Term;
 
 use function Mantle\Support\Helpers\collect;
@@ -117,7 +117,6 @@ public function get_query_args(): array {
 
 		return array_merge(
 			[
-				'fields'              => 'ids',
 				'ignore_sticky_posts' => true,
 				'meta_query'          => $this->meta_query, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
 				'order'               => $order,
@@ -130,6 +129,9 @@ public function get_query_args(): array {
 			],
 			$this->get_date_query_args(),
 			$this->wheres,
+			[
+				'fields' => 'ids',
+			]
 		);
 	}
 
@@ -148,14 +150,21 @@ public function get(): Collection {
 			fn () => $query->query( $this->get_query_args() ),
 		);
 
-		$this->found_rows = $query->found_posts;
-		$post_ids         = $query->posts;
+		if ( empty( $query->found_posts ) && count( $query->posts ) > 0 ) {
+			$this->found_rows = null;
+		} else {
+			$this->found_rows = $query->found_posts;
+		}
+
+		$post_ids = $query->posts;
 
 		if ( empty( $post_ids ) ) {
-			return collect();
+			return ( new Collection() )->with_found_rows( $this->found_rows ); // @phpstan-ignore-line should return
 		}
 
-		$models = $this->get_models( $post_ids );
+		$models = $this
+			->get_models( $post_ids )
+			->with_found_rows( $this->found_rows );
 
 		// Return the models if there are no models or if multiple model instances
 		// are used. Eager loading does not currently support multiple models.
@@ -195,11 +204,18 @@ public function count(): int {
 	protected function get_models( array $post_ids ): Collection {
 		if ( is_array( $this->model ) ) {
 			$model_object_types = $this->get_model_object_names();
-			return collect( $post_ids )
+
+			return Collection::from( $post_ids )
 				->map(
 					function ( $post_id ) use ( $model_object_types ) {
 						$post_type = \get_post_type( $post_id );
 
+						if ( empty( $model_object_types[ $post_type ] ) ) {
+							throw new RuntimeException(
+								"Missing model for object type [{ $post_type }]."
+							);
+						}
+
 						if ( empty( $post_type ) ) {
 							return null;
 						}
@@ -207,12 +223,13 @@ function ( $post_id ) use ( $model_object_types ) {
 						return $model_object_types[ $post_type ]::find( $post_id );
 					}
 				)
-				->filter();
-		} else {
-			return collect( $post_ids )
-				->map( [ $this->model, 'find' ] )
-				->filter();
+				->filter()
+				->values();
 		}
+
+		return Collection::from( $post_ids )
+			->map( [ $this->model, 'find' ] )
+			->filter();
 	}
 
 	/**
@@ -295,6 +312,18 @@ public function orWhereTerm( ...$args ) {
 		return $this->whereTerm( ...$args );
 	}
 
+	/**
+	 * Fetch the query with 'no_found_rows' set to a value.
+	 *
+	 * Setting to 'true' prevents counting all the available rows for a query.
+	 *
+	 * @param bool $value Whether to set 'no_found_rows' to true.
+	 * @return static
+	 */
+	public function withNoFoundRows( bool $value = true ): static {
+		return $this->where( 'no_found_rows', $value );
+	}
+
 	/**
 	 * Dump the SQL query being executed.
 	 *
diff --git a/src/mantle/database/query/class-term-query-builder.php b/src/mantle/database/query/class-term-query-builder.php
index c624dc9d..40eddc3c 100644
--- a/src/mantle/database/query/class-term-query-builder.php
+++ b/src/mantle/database/query/class-term-query-builder.php
@@ -7,9 +7,6 @@
 
 namespace Mantle\Database\Query;
 
-use Mantle\Support\Collection;
-use function Mantle\Support\Helpers\collect;
-
 /**
  * Term Query Builder
  *
@@ -90,7 +87,6 @@ public function get_query_args(): array {
 
 		return array_merge(
 			[
-				'fields'          => 'ids',
 				'hide_empty'      => false,
 				'meta_query'      => $this->meta_query, // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
 				'number'          => $this->limit,
@@ -100,6 +96,9 @@ public function get_query_args(): array {
 				'taxonomy'        => $taxonomies,
 			],
 			$this->wheres,
+			[
+				'fields' => 'ids',
+			]
 		);
 	}
 
@@ -113,18 +112,23 @@ public function get(): Collection {
 
 		$this->query_hash = spl_object_hash( $query );
 
+		/**
+		 * Fetch the terms IDs for the query.
+		 *
+		 * @var int[]
+		 */
 		$term_ids = $this->with_clauses(
 			fn (): array => $query->query( $this->get_query_args() ),
 		);
 
 		if ( empty( $term_ids ) ) {
-			return collect();
+			return new Collection(); // @phpstan-ignore-line should return
 		}
 
 		$models = array_map( [ $this->model, 'find' ], $term_ids );
 
 		return $this->eager_load_relations(
-			collect( $models )->filter()->values(),
+			Collection::from( $models )->filter()->values(),
 		);
 	}
 
@@ -140,7 +144,7 @@ public function count(): int {
 
 		$this->query_hash = spl_object_hash( $query );
 
-		return $this->with_clauses(
+		return (int) $this->with_clauses(
 			fn (): int => (int) $query->query(
 				array_merge(
 					$this->get_query_args(),
diff --git a/src/mantle/support/class-collection.php b/src/mantle/support/class-collection.php
index 1970e0ed..923a5312 100644
--- a/src/mantle/support/class-collection.php
+++ b/src/mantle/support/class-collection.php
@@ -446,7 +446,7 @@ public function first( callable $callback = null, $default = null ) {
 	/**
 	 * Get a flattened array of the items in the collection.
 	 *
-	 *  @param  int|float $depth
+	 * @param  int|float $depth
 	 * @return static<int, mixed>
 	 */
 	public function flatten( $depth = INF ) {
@@ -456,7 +456,7 @@ public function flatten( $depth = INF ) {
 	/**
 	 * Flip the items in the collection.
 	 *
-	 * @return static<TValue, TKey>
+	 * @return static<int|string, TKey>
 	 */
 	public function flip() {
 		return new static( array_flip( $this->items ) );
@@ -1327,7 +1327,7 @@ public function values() {
 	 * @template TZipValue
 	 *
 	 * @param  \Mantle\Contracts\Support\Arrayable<array-key, TZipValue>|iterable<array-key, TZipValue> ...$items
-	 * @return static<int, static<int, TValue|TZipValue>>
+	 * @return static<int, static<TKey, TValue|TZipValue>>
 	 */
 	public function zip( ...$items ) {
 		$arrayable_items = array_map(
diff --git a/tests/database/query/test-post-query-builder.php b/tests/database/query/test-post-query-builder.php
index 73c0ba32..cf4c8a1c 100644
--- a/tests/database/query/test-post-query-builder.php
+++ b/tests/database/query/test-post-query-builder.php
@@ -527,6 +527,36 @@ public function test_count() {
 		$this->assertEquals( 1, Testable_Post::whereIn( 'id', [ $post_id ] )->count() );
 	}
 
+	public function test_found_rows() {
+		static::factory()->post->create_many( 25 );
+
+		$query = Testable_Post::query()
+			->take( 10 )
+			->get();
+
+		$this->assertInstanceOf( \Mantle\Database\Query\Collection::class, $query );
+		$this->assertEquals( 10, $query->count() );
+		$this->assertEquals( 25, $query->found_rows() );
+
+		$models = $query->models();
+
+		$this->assertNotInstanceOf( \Mantle\Database\Query\Collection::class, $models );
+		$this->assertEquals( 1, $models->count() );
+	}
+
+	public function test_no_found_rows_true() {
+		static::factory()->post->create_many( 10 );
+
+		$query = Testable_Post::query()
+			->withNoFoundRows()
+			->take( 10 )
+			->get();
+
+		$this->assertInstanceOf( \Mantle\Database\Query\Collection::class, $query );
+		$this->assertEquals( 10, $query->count() );
+		$this->assertNull( $query->found_rows() );
+	}
+
 	public function test_post_by_date() {
 		$old_date = Carbon::now( wp_timezone() )->subMonth();
 		$now      = Carbon::now( wp_timezone() );

From 010a5b41ee4937b18450343c97328abd2ad5f8e6 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Mon, 2 Oct 2023 13:23:23 -0400
Subject: [PATCH 16/32] Adds a trait to easily silence remote requests during
 testing (#460)

* Remove fake() alias, too broad

* Adds a trait to easily silence remote requests during test

* Adding some types to Interacts_With_Requests to prevent bad values from slipping through

* Adding types

* More types for other methods
---
 .../trait-interacts-with-requests.php         | 97 +++++++++++--------
 .../trait-prevent-remote-requests.php         | 27 ++++++
 .../test-interacts-with-external-requests.php | 29 ++++++
 3 files changed, 113 insertions(+), 40 deletions(-)
 create mode 100644 src/mantle/testing/concerns/trait-prevent-remote-requests.php

diff --git a/src/mantle/testing/concerns/trait-interacts-with-requests.php b/src/mantle/testing/concerns/trait-interacts-with-requests.php
index 382f1467..6a4a2718 100644
--- a/src/mantle/testing/concerns/trait-interacts-with-requests.php
+++ b/src/mantle/testing/concerns/trait-interacts-with-requests.php
@@ -2,7 +2,7 @@
 /**
  * Interacts_With_Requests trait file.
  *
- * @phpcs:disable WordPress.NamingConventions.ValidFunctionName
+ * @phpcs:disable WordPress.NamingConventions.ValidFunctionName, Squiz.Commenting.FunctionComment.SpacingAfterParamType
  *
  * @package Mantle
  */
@@ -10,6 +10,7 @@
 namespace Mantle\Testing\Concerns;
 
 use Closure;
+use Mantle\Contracts\Support\Arrayable;
 use Mantle\Http_Client\Request;
 use Mantle\Http_Client\Response;
 use Mantle\Support\Collection;
@@ -26,19 +27,21 @@
 
 /**
  * Allow Mock HTTP Requests
+ *
+ * @mixin \PHPUnit\Framework\TestCase
  */
 trait Interacts_With_Requests {
 	/**
 	 * Storage of the callbacks to mock the requests.
 	 *
-	 * @var Collection
+	 * @var Collection<int, callable(string, array): Mock_Http_Response|Arrayable|WP_Error|null>
 	 */
 	protected Collection $stub_callbacks;
 
 	/**
 	 * Storage of request URLs.
 	 *
-	 * @var Collection
+	 * @var Collection<int, Request>
 	 */
 	protected Collection $recorded_requests;
 
@@ -46,21 +49,21 @@ trait Interacts_With_Requests {
 	 * Flag to prevent external requests from being made. By default, this is
 	 * false.
 	 *
-	 * @var Mock_Http_Response|Closure|bool
+	 * @var Mock_Http_Response|callable|bool
 	 */
 	protected mixed $preventing_stray_requests = false;
 
 	/**
 	 * Recorded actual HTTP requests made during the test.
 	 *
-	 * @var Collection
+	 * @var Collection<int, string>
 	 */
 	protected Collection $recorded_actual_requests;
 
 	/**
 	 * Setup the trait.
 	 */
-	public function interacts_with_requests_set_up() {
+	public function interacts_with_requests_set_up(): void {
 		$this->stub_callbacks           = collect();
 		$this->recorded_requests        = collect();
 		$this->recorded_actual_requests = collect();
@@ -71,7 +74,7 @@ public function interacts_with_requests_set_up() {
 	/**
 	 * Remove the filter to intercept the request.
 	 */
-	public function interacts_with_requests_tear_down() {
+	public function interacts_with_requests_tear_down(): void {
 		\remove_filter( 'pre_http_request', [ $this, 'pre_http_request' ], PHP_INT_MAX );
 
 		$this->report_stray_requests();
@@ -82,14 +85,14 @@ public function interacts_with_requests_tear_down() {
 	 *
 	 * @param Mock_Http_Response|\Closure|bool $response A default response or callback to use, boolean otherwise.
 	 */
-	public function prevent_stray_requests( $response = true ) {
+	public function prevent_stray_requests( Mock_Http_Response|Closure|bool $response = true ): void {
 		$this->preventing_stray_requests = $response;
 	}
 
 	/**
 	 * Allow stray external requests.
 	 */
-	public function allow_stray_requests() {
+	public function allow_stray_requests(): void {
 		$this->preventing_stray_requests = false;
 	}
 
@@ -102,21 +105,30 @@ public function allow_stray_requests() {
 	 * information on how this is used, see the `create_stub_request_callback()` method below and the
 	 * relevant test for the trait (Mantle\Tests\Testing\Concerns\Test_Interacts_With_Requests).
 	 *
+	 * Example:
+	 *
+	 *   $this->fake_request();
+	 *   $this->fake_request( 'https://testing.com/*' );
+	 *   $this->fake_request( 'https://testing.com/*' )->with_response_code( 404 )->with_body( 'test body' );
+	 *   $this->fake_request( fn () => Mock_Http_Response::create()->with_body( 'test body' ) );
+	 *
+	 * @link https://mantle.alley.com/docs/testing/remote-requests#faking-requests Documentation
+	 *
 	 * @throws \InvalidArgumentException Thrown on invalid argument.
 	 *
-	 * @param Closure|string|array                  $url_or_callback URL to fake, array of URL and response pairs, or a closure
-	 *                                                               that will return a faked response.
-	 * @param Mock_Http_Response|Mock_Http_Sequence $response Optional response object, defaults to creating a 200 response.
+	 * @template TCallableReturn of Mock_Http_Sequence|Mock_Http_Response|Arrayable
+	 *
+	 * @param (callable(string, array): TCallableReturn)|Mock_Http_Response|string|array<string, Mock_Http_Response|callable> $url_or_callback URL to fake, array of URL and response pairs, or a closure
+	 *                                                                                                                                         that will return a faked response.
+	 * @param Mock_Http_Response|callable $response Optional response object, defaults to a 200 response with no body.
 	 * @return static|Mock_Http_Response
 	 */
-	public function fake_request( Mock_Http_Response|Mock_Http_Sequence|Closure|string|array|null $url_or_callback = null, Mock_Http_Response|Mock_Http_Sequence|Closure $response = null ) {
+	public function fake_request( Mock_Http_Response|callable|string|array|null $url_or_callback = null, Mock_Http_Response|callable $response = null ): static|Mock_Http_Response {
 		if ( is_array( $url_or_callback ) ) {
 			$this->stub_callbacks = $this->stub_callbacks->merge(
 				collect( $url_or_callback )
 					->map(
-						function( $response, $url_or_callback ) {
-							return $this->create_stub_request_callback( $url_or_callback, $response );
-						}
+						fn ( $response, $url_or_callback ) => $this->create_stub_request_callback( $url_or_callback, $response ),
 					)
 			);
 
@@ -126,6 +138,7 @@ function( $response, $url_or_callback ) {
 		// Allow a callback to be passed instead.
 		if ( is_callable( $url_or_callback ) ) {
 			$this->stub_callbacks->push( $url_or_callback );
+
 			return $this;
 		}
 
@@ -152,18 +165,6 @@ function( $response, $url_or_callback ) {
 		return $response;
 	}
 
-	/**
-	 * Alias for fake_request().
-	 *
-	 * @param Closure|string|array                  $url_or_callback URL to fake, array of URL and response pairs, or a closure
-	 *                                                               that will return a faked response.
-	 * @param Mock_Http_Response|Mock_Http_Sequence $response Optional response object, defaults to creating a 200 response.
-	 * @return static|Mock_Http_Response
-	 */
-	public function fake( Mock_Http_Response|Mock_Http_Sequence|Closure|string|array|null $url_or_callback = null, Mock_Http_Response|Mock_Http_Sequence|Closure $response = null ) {
-		return $this->fake_request( $url_or_callback, $response );
-	}
-
 	/**
 	 * Filters pre_http_request to intercept the request, mock a response, and
 	 * return it. If the response has already been preempted, the preempt will
@@ -209,16 +210,31 @@ public function pre_http_request( $preempt, $request_args, $url ) {
 	 *
 	 * @param string $url          Request URL.
 	 * @param array  $request_args Request arguments.
-	 * @return array|null
+	 * @return array|WP_Error|null
 	 */
 	protected function get_stub_response( $url, $request_args ): array|WP_Error|null {
 		if ( ! $this->stub_callbacks->is_empty() ) {
 			foreach ( $this->stub_callbacks as $callback ) {
 				$response = $callback( $url, $request_args );
-				if ( $response instanceof Mock_Http_Response ) {
+
+				if ( $response instanceof Mock_Http_Response || $response instanceof Arrayable ) {
 					return $response->to_array();
 				}
 
+				// Throw an error when an unknown response type is returned from the callback.
+				if ( $response && ! is_array( $response ) && ! is_wp_error( $response ) ) {
+					throw new RuntimeException(
+						sprintf(
+							'Unknown response type returned for faked request to [%s]. Expected a (%s|%s|%s|array), got %s.',
+							$url,
+							Mock_Http_Response::class,
+							Arrayable::class,
+							WP_Error::class,
+							gettype( $response )
+						),
+					);
+				}
+
 				if ( ! is_null( $response ) ) {
 					return $response;
 				}
@@ -228,7 +244,7 @@ protected function get_stub_response( $url, $request_args ): array|WP_Error|null
 		if ( false !== $this->preventing_stray_requests ) {
 			$prevent = value( $this->preventing_stray_requests );
 
-			if ( $prevent instanceof Mock_Http_Response ) {
+			if ( $prevent instanceof Mock_Http_Response || $prevent instanceof Arrayable ) {
 				return $prevent->to_array();
 			}
 
@@ -277,17 +293,17 @@ protected function store_streamed_response( string $url, array $response, array
 	/**
 	 * Retrieve a callback for the stubbed response.
 	 *
-	 * @param string                                        $url URL to stub.
-	 * @param Closure|Mock_Http_Response|Mock_Http_Sequence $response Response to send.
-	 * @return Closure
+	 * @param string                      $url URL to stub.
+	 * @param callable|Mock_Http_Response $response Response to send.
+	 * @return callable
 	 */
-	protected function create_stub_request_callback( string $url, $response ): Closure {
+	protected function create_stub_request_callback( string $url, Mock_Http_Response|callable $response ): callable {
 		return function( string $request_url, array $request_args ) use ( $url, $response ) {
 			if ( ! Str::is( Str::start( $url, '*' ), $request_url ) ) {
 				return;
 			}
 
-			return $response instanceof Closure || $response instanceof Mock_Http_Sequence
+			return is_callable( $response )
 				? $response( $request_url, $request_args )
 				: $response;
 		};
@@ -333,9 +349,10 @@ protected function report_stray_requests(): void {
 	 * @param int             $expected_times Number of times the request should have been
 	 *                                        sent, optional.
 	 */
-	public function assertRequestSent( $url_or_callback = null, int $expected_times = null ) {
+	public function assertRequestSent( string|callable|null $url_or_callback = null, int $expected_times = null ): void {
 		if ( is_null( $url_or_callback ) ) {
 			PHPUnit::assertTrue( $this->recorded_requests->is_not_empty(), 'A request was made.' );
+
 			return;
 		}
 
@@ -360,7 +377,7 @@ public function assertRequestSent( $url_or_callback = null, int $expected_times
 	 *
 	 * @param string|callable $url_or_callback URL to check against or callback.
 	 */
-	public function assertRequestNotSent( $url_or_callback = null ) {
+	public function assertRequestNotSent( string|callable|null $url_or_callback = null ): void {
 		if ( is_string( $url_or_callback ) ) {
 			$url_or_callback = fn ( $request ) => Str::is( $url_or_callback, $request->url() );
 		}
@@ -377,7 +394,7 @@ public function assertRequestNotSent( $url_or_callback = null ) {
 	 *
 	 * @return void
 	 */
-	public function assertNoRequestSent() {
+	public function assertNoRequestSent(): void {
 		PHPUnit::assertEmpty(
 			$this->recorded_requests,
 			'Requests were recorded',
@@ -390,7 +407,7 @@ public function assertNoRequestSent() {
 	 * @param int $count Request count.
 	 * @return void
 	 */
-	public function assertRequestCount( int $count ) {
+	public function assertRequestCount( int $count ): void {
 		PHPUnit::assertCount( $count, $this->recorded_requests );
 	}
 }
diff --git a/src/mantle/testing/concerns/trait-prevent-remote-requests.php b/src/mantle/testing/concerns/trait-prevent-remote-requests.php
new file mode 100644
index 00000000..a925977a
--- /dev/null
+++ b/src/mantle/testing/concerns/trait-prevent-remote-requests.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Prevent_Remote_Requests trait file
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Testing\Concerns;
+
+use Mantle\Testing\Mock_Http_Response;
+
+/**
+ * Prevent remote requests from being made by providing a default response to
+ * the remote request.
+ *
+ * @mixin \Mantle\Testing\Test_Case
+ */
+trait Prevent_Remote_Requests {
+	/**
+	 * Setup the trait.
+	 */
+	public function prevent_remote_requests_set_up(): void {
+		if ( ! $this->prevent_remote_requests ) {
+			$this->prevent_stray_requests( new Mock_Http_Response() );
+		}
+	}
+}
diff --git a/tests/testing/concerns/test-interacts-with-external-requests.php b/tests/testing/concerns/test-interacts-with-external-requests.php
index 1afd4752..fb655fc7 100644
--- a/tests/testing/concerns/test-interacts-with-external-requests.php
+++ b/tests/testing/concerns/test-interacts-with-external-requests.php
@@ -1,10 +1,12 @@
 <?php
 namespace Mantle\Tests\Testing\Concerns;
 
+use DateTime;
 use InvalidArgumentException;
 use Mantle\Facade\Http;
 use Mantle\Http_Client\Factory;
 use Mantle\Http_Client\Pending_Request;
+use Mantle\Testing\Concerns\Prevent_Remote_Requests;
 use Mantle\Testing\Mock_Http_Response;
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Mock_Http_Sequence;
@@ -16,6 +18,8 @@
  * @group testing
  */
 class Test_Interacts_With_External_Requests extends Framework_Test_Case {
+	use Prevent_Remote_Requests;
+
 	public function test_fake_request() {
 		$this->fake_request( 'https://testing.com/*' )
 			->with_response_code( 404 )
@@ -25,6 +29,8 @@ public function test_fake_request() {
 			->with_response_code( 500 )
 			->with_body( 'fake body' );
 
+		$this->fake_request( 'https://example.com/', Mock_Http_Response::create()->with_body( 'example body' ) );
+
 		$response = wp_remote_get( 'https://testing.com/' );
 		$this->assertEquals( 'test body', wp_remote_retrieve_body( $response ) );
 		$this->assertEquals( 404, wp_remote_retrieve_response_code( $response ) );
@@ -32,6 +38,9 @@ public function test_fake_request() {
 		$response = wp_remote_get( 'https://github.com/' );
 		$this->assertEquals( 'fake body', wp_remote_retrieve_body( $response ) );
 		$this->assertEquals( 500, wp_remote_retrieve_response_code( $response ) );
+
+		$response = wp_remote_get( 'https://example.com/' );
+		$this->assertEquals( 'example body', wp_remote_retrieve_body( $response ) );
 	}
 
 	public function test_fake_all_requests() {
@@ -47,6 +56,9 @@ public function test_fake_all_requests() {
 	public function test_fake_callback() {
 		$this->fake_request(
 			function() {
+				$this->assertIsString( func_get_arg( 0 ) );
+				$this->assertIsArray( func_get_arg( 1 ) );
+
 				return Mock_Http_Response::create()
 					->with_response_code( 123 )
 					->with_body( 'apples' );
@@ -229,6 +241,13 @@ public function test_prevent_stray_requests_no_fallback() {
 		Http::get( 'https://example.org/path/' );
 	}
 
+	public function test_prevent_remote_requests_trait() {
+		// The trait sets up the default response.
+		$this->assertInstanceOf( Mock_Http_Response::class, $this->preventing_stray_requests );
+
+		wp_remote_get( 'https://example.com/' );
+	}
+
 	public function test_file_as_response() {
 		$this->fake_request(
 			fn() => Mock_Http_Response::create()->with_file( MANTLE_PHPUNIT_FIXTURES_PATH . '/images/alley.jpg' )
@@ -262,4 +281,14 @@ public function test_unknown_file_as_response() {
 			Mock_Http_Response::create()->with_file( 'unknown' )
 		);
 	}
+
+	public function test_unknown_return_value_from_callback() {
+		$this->fake_request(
+			fn () => new DateTime(),
+		);
+
+		$this->expectException( RuntimeException::class );
+
+		Http::get( 'https://example.com/' );
+	}
 }

From a206be3a04b89755fae52128903388ed59d157c1 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Mon, 2 Oct 2023 13:36:47 -0400
Subject: [PATCH 17/32] Improve the messaging of assertions (#461)

* Improve the messaging for assertions against the database

* Improve the messaging of the Interacts_With_Hooks trait assertions

* Apply suggestions from code review

Co-authored-by: Greg Marshall <mogmarsh@users.noreply.github.com>

---------

Co-authored-by: Greg Marshall <mogmarsh@users.noreply.github.com>
---
 .../testing/concerns/trait-assertions.php     | 229 ++++++++----------
 .../concerns/trait-interacts-with-hooks.php   |  30 ++-
 .../concerns/test-interacts-with-hooks.php    |  10 +
 3 files changed, 139 insertions(+), 130 deletions(-)

diff --git a/src/mantle/testing/concerns/trait-assertions.php b/src/mantle/testing/concerns/trait-assertions.php
index 23512c9d..0c6bc7ef 100644
--- a/src/mantle/testing/concerns/trait-assertions.php
+++ b/src/mantle/testing/concerns/trait-assertions.php
@@ -2,15 +2,19 @@
 /**
  * This file contains the Assertions trait
  *
+ * phpcs:disable WordPress.PHP.DevelopmentFunctions.error_log_print_r
+ *
  * @package Mantle
  */
 
 namespace Mantle\Testing\Concerns;
 
+use Mantle\Contracts\Database\Core_Object;
 use Mantle\Database\Model\Post;
 use Mantle\Database\Model\Term;
 use Mantle\Database\Model\User;
 use PHPUnit\Framework\Assert as PHPUnit;
+use WP_Post;
 use WP_Term;
 
 use function Mantle\Support\Helpers\get_term_object;
@@ -84,7 +88,7 @@ public static function assertEqualsIgnoreEOL( $expected, $actual ) {
 	 * @param array $expected Expected array.
 	 * @param array $actual   Array to check.
 	 */
-	public static function assertEqualSets( $expected, $actual ) {
+	public static function assertEqualSets( $expected, $actual ): void {
 		sort( $expected );
 		sort( $actual );
 		PHPUnit::assertEquals( $expected, $actual );
@@ -96,7 +100,7 @@ public static function assertEqualSets( $expected, $actual ) {
 	 * @param array $expected Expected array.
 	 * @param array $actual   Array to check.
 	 */
-	public static function assertEqualSetsWithIndex( $expected, $actual ) {
+	public static function assertEqualSetsWithIndex( $expected, $actual ): void {
 		ksort( $expected );
 		ksort( $actual );
 		PHPUnit::assertEquals( $expected, $actual );
@@ -107,7 +111,7 @@ public static function assertEqualSetsWithIndex( $expected, $actual ) {
 	 *
 	 * @param array $array Array to check.
 	 */
-	public static function assertNonEmptyMultidimensionalArray( $array ) {
+	public static function assertNonEmptyMultidimensionalArray( $array ): void {
 		PHPUnit::assertTrue( is_array( $array ) );
 		PHPUnit::assertNotEmpty( $array );
 
@@ -129,7 +133,7 @@ public static function assertNonEmptyMultidimensionalArray( $array ) {
 	 * @param string ...$prop Any number of WP_Query properties that are expected
 	 *                        to be true for the current request.
 	 */
-	public static function assertQueryTrue( ...$prop ) {
+	public static function assertQueryTrue( ...$prop ): void {
 		global $wp_query;
 
 		$all = [
@@ -197,7 +201,7 @@ public static function assertQueryTrue( ...$prop ) {
 	 * @param int $id Expected ID.
 	 */
 	public static function assertQueriedObjectId( int $id ): void {
-		PHPUnit::assertSame( $id, get_queried_object_id() );
+		PHPUnit::assertSame( $id, get_queried_object_id(), 'Queried object ID is not the same.' );
 	}
 
 	/**
@@ -206,44 +210,32 @@ public static function assertQueriedObjectId( int $id ): void {
 	 * @param int $id Expected ID.
 	 */
 	public static function assertNotQueriedObjectId( int $id ): void {
-		PHPUnit::assertNotSame( $id, get_queried_object_id() );
+		PHPUnit::assertNotSame( $id, get_queried_object_id(), 'Queried object ID is the same.' );
 	}
 
 	/**
 	 * Assert that a given object is equivalent to the global queried object.
 	 *
-	 * @param Object $object Expected object.
+	 * @param mixed $object Expected object.
+	 * @param bool  $strict Whether to assert the same object type or just the same identifying data.
 	 */
-	public static function assertQueriedObject( mixed $object ): void {
+	public static function assertQueriedObject( mixed $object, bool $strict = false ): void {
 		$queried_object = get_queried_object();
 
-		// First, assert the same object types.
-		PHPUnit::assertInstanceOf( get_class( $object ), $queried_object );
+		// Assert the same object types if strict mode.
+		if ( $strict ) {
+			PHPUnit::assertInstanceOf( get_class( $object ), $queried_object );
+		}
 
 		// Next, assert identifying data about the object.
-		switch ( true ) {
-			case $object instanceof Post:
-			case $object instanceof User:
-				PHPUnit::assertSame( $object->id(), $queried_object->ID );
-				break;
-
-			case $object instanceof Term:
-				PHPUnit::assertSame( $object->id(), $queried_object->term_id );
-				break;
-
-			case $object instanceof \WP_Post:
-			case $object instanceof \WP_User:
-				PHPUnit::assertSame( $object->ID, $queried_object->ID );
-				break;
-
-			case $object instanceof \WP_Term:
-				PHPUnit::assertSame( $object->term_id, $queried_object->term_id );
-				break;
-
-			case $object instanceof \WP_Post_Type:
-				PHPUnit::assertSame( $object->name, $queried_object->name );
-				break;
-		}
+		match ( true ) {
+			$object instanceof Post || $object instanceof User => PHPUnit::assertSame( $object->id(), $queried_object->ID, 'Queried object ID is not the same.' ),
+			$object instanceof Term => PHPUnit::assertSame( $object->id(), $queried_object->term_id, 'Queried object ID is not the same.' ),
+			$object instanceof \WP_Post || $object instanceof \WP_User => PHPUnit::assertSame( $object->ID, $queried_object->ID, 'Queried object ID is not the same.' ),
+			$object instanceof \WP_Term => PHPUnit::assertSame( $object->term_id, $queried_object->term_id, 'Queried object ID is not the same.' ),
+			$object instanceof \WP_Post_Type => PHPUnit::assertSame( $object->name, $queried_object->name, 'Queried object name is not the same.' ),
+			default => PHPUnit::fail( 'Unknown object type.' ),
+		};
 	}
 
 	/**
@@ -254,36 +246,21 @@ public static function assertQueriedObject( mixed $object ): void {
 	public static function assertNotQueriedObject( mixed $object ): void {
 		$queried_object = get_queried_object();
 
-		switch ( true ) {
-			case $object instanceof Post:
-			case $object instanceof User:
-				PHPUnit::assertNotSame( $object->id(), $queried_object->ID );
-				break;
-
-			case $object instanceof Term:
-				PHPUnit::assertNotSame( $object->id(), $queried_object->term_id );
-				break;
-
-			case $object instanceof \WP_Post:
-			case $object instanceof \WP_User:
-				PHPUnit::assertNotSame( $object->ID, $queried_object->ID );
-				break;
-
-			case $object instanceof \WP_Term:
-				PHPUnit::assertNotSame( $object->term_id, $queried_object->term_id );
-				break;
-
-			case $object instanceof \WP_Post_Type:
-				PHPUnit::assertNotSame( $object->name, $queried_object->name );
-				break;
-		}
+		match ( true ) {
+			$object instanceof Post || $object instanceof User => PHPUnit::assertNotSame( $object->id(), $queried_object->ID, 'Queried object ID is the same.' ),
+			$object instanceof Term => PHPUnit::assertNotSame( $object->id(), $queried_object->term_id, 'Queried object ID is the same.' ),
+			$object instanceof \WP_Post || $object instanceof \WP_User => PHPUnit::assertNotSame( $object->ID, $queried_object->ID, 'Queried object ID is the same.' ),
+			$object instanceof \WP_Term => PHPUnit::assertNotSame( $object->term_id, $queried_object->term_id, 'Queried object ID is the same.' ),
+			$object instanceof \WP_Post_Type => PHPUnit::assertNotSame( $object->name, $queried_object->name, 'Queried object name is the same.' ),
+			default => PHPUnit::fail( 'Unknown object type.' ),
+		};
 	}
 
 	/**
 	 * Assert that the queried object is null.
 	 */
 	public static function assertQueriedObjectNull(): void {
-		PHPUnit::assertNull( get_queried_object(), 'Expected queried object to be null.' );
+		PHPUnit::assertNull( get_queried_object(), 'Queried object is not null.' );
 	}
 
 	/**
@@ -291,18 +268,19 @@ public static function assertQueriedObjectNull(): void {
 	 *
 	 * @param array $arguments Arguments to query against.
 	 */
-	public function assertPostExists( array $arguments ) {
-		$posts = \get_posts(
-			array_merge(
-				[
-					'fields'         => 'ids',
-					'posts_per_page' => 1,
-				],
-				$arguments
-			)
+	public function assertPostExists( array $arguments ): void {
+		$arguments = array_merge(
+			[
+				'fields'         => 'ids',
+				'posts_per_page' => 1,
+			],
+			$arguments
 		);
 
-		PHPUnit::assertNotEmpty( $posts );
+		PHPUnit::assertNotEmpty(
+			\get_posts( $arguments ),
+			"Post not found with arguments: \n" . print_r( $arguments, true ),
+		);
 	}
 
 	/**
@@ -310,18 +288,19 @@ public function assertPostExists( array $arguments ) {
 	 *
 	 * @param array $arguments Arguments to query against.
 	 */
-	public function assertPostDoesNotExists( array $arguments ) {
-		$posts = \get_posts(
-			array_merge(
-				[
-					'fields'         => 'ids',
-					'posts_per_page' => 1,
-				],
-				$arguments
-			)
+	public function assertPostDoesNotExists( array $arguments ): void {
+		$arguments = array_merge(
+			[
+				'fields'         => 'ids',
+				'posts_per_page' => 1,
+			],
+			$arguments
 		);
 
-		PHPUnit::assertEmpty( $posts );
+		PHPUnit::assertEmpty(
+			\get_posts( $arguments ),
+			"Post found with arguments: \n" . print_r( $arguments, true ),
+		);
 	}
 
 	/**
@@ -329,19 +308,20 @@ public function assertPostDoesNotExists( array $arguments ) {
 	 *
 	 * @param array $arguments Arguments to query against.
 	 */
-	public function assertTermExists( array $arguments ) {
-		$terms = \get_terms(
-			array_merge(
-				[
-					'fields'     => 'ids',
-					'count'      => 1,
-					'hide_empty' => false,
-				],
-				$arguments
-			)
+	public function assertTermExists( array $arguments ): void {
+		$arguments = array_merge(
+			[
+				'fields'     => 'ids',
+				'count'      => 1,
+				'hide_empty' => false,
+			],
+			$arguments
 		);
 
-		PHPUnit::assertNotEmpty( $terms );
+		PHPUnit::assertNotEmpty(
+			\get_terms( $arguments ),
+			"Term not found with arguments: \n" . print_r( $arguments, true ),
+		);
 	}
 
 	/**
@@ -349,19 +329,20 @@ public function assertTermExists( array $arguments ) {
 	 *
 	 * @param array $arguments Arguments to query against.
 	 */
-	public function assertTermDoesNotExists( array $arguments ) {
-		$terms = \get_terms(
-			array_merge(
-				[
-					'fields'     => 'ids',
-					'count'      => 1,
-					'hide_empty' => false,
-				],
-				$arguments
-			)
+	public function assertTermDoesNotExists( array $arguments ): void {
+		$arguments = array_merge(
+			[
+				'fields'     => 'ids',
+				'count'      => 1,
+				'hide_empty' => false,
+			],
+			$arguments
 		);
 
-		PHPUnit::assertEmpty( $terms );
+		PHPUnit::assertEmpty(
+			\get_terms( $arguments ),
+			"Term found with arguments: \n" . print_r( $arguments, true ),
+		);
 	}
 
 	/**
@@ -370,17 +351,18 @@ public function assertTermDoesNotExists( array $arguments ) {
 	 * @param array $arguments Arguments to query against.
 	 */
 	public function assertUserExists( array $arguments ) {
-		$users = \get_users(
-			array_merge(
-				[
-					'fields' => 'ids',
-					'count'  => 1,
-				],
-				$arguments
-			)
+		$arguments = array_merge(
+			[
+				'fields' => 'ids',
+				'count'  => 1,
+			],
+			$arguments
 		);
 
-		PHPUnit::assertNotEmpty( $users );
+		PHPUnit::assertNotEmpty(
+			\get_users( $arguments ),
+			"User not found with arguments: \n" . print_r( $arguments, true ),
+		);
 	}
 
 	/**
@@ -388,18 +370,19 @@ public function assertUserExists( array $arguments ) {
 	 *
 	 * @param array $arguments Arguments to query against.
 	 */
-	public function assertUserDoesNotExists( array $arguments ) {
-		$users = \get_users(
-			array_merge(
-				[
-					'fields' => 'ids',
-					'count'  => 1,
-				],
-				$arguments
-			)
+	public function assertUserDoesNotExists( array $arguments ): void {
+		$arguments = array_merge(
+			[
+				'fields' => 'ids',
+				'count'  => 1,
+			],
+			$arguments
 		);
 
-		PHPUnit::assertEmpty( $users );
+		PHPUnit::assertEmpty(
+			\get_users( $arguments ),
+			"User found with arguments: \n" . print_r( $arguments, true ),
+		);
 	}
 
 	/**
@@ -433,7 +416,7 @@ protected function get_term_from_argument( $argument ): ?WP_Term {
 	 * @param Term|\WP_Term|int $term Term to check.
 	 * @return void
 	 */
-	public function assertPostHasTerm( $post, $term ) {
+	public function assertPostHasTerm( Post|WP_Post|int $post, Term|WP_Term|int $term ): void {
 		if ( $post instanceof Post ) {
 			$post = $post->id();
 		}
@@ -441,7 +424,7 @@ public function assertPostHasTerm( $post, $term ) {
 		$term = $this->get_term_from_argument( $term );
 
 		PHPUnit::assertInstanceOf( \WP_Term::class, $term, 'Term not found to assert against' );
-		PHPUnit::assertTrue( \has_term( $term->term_id, $term->taxonomy, $post ) );
+		PHPUnit::assertTrue( \has_term( $term->term_id, $term->taxonomy, $post ), 'Term not found on post' );
 	}
 
 	/**
@@ -453,7 +436,7 @@ public function assertPostHasTerm( $post, $term ) {
 	 * @param Term|\WP_Term|int $term Term to check.
 	 * @return void
 	 */
-	public function assertPostNotHasTerm( $post, $term ) {
+	public function assertPostNotHasTerm( Post|WP_Post|int $post, Term|WP_Term|int $term ): void {
 		if ( $post instanceof Post ) {
 			$post = $post->id();
 		}
@@ -461,7 +444,7 @@ public function assertPostNotHasTerm( $post, $term ) {
 		$term = $this->get_term_from_argument( $term );
 
 		if ( $term ) {
-			PHPUnit::assertFalse( \has_term( $term->term_id, $term->taxonomy, $post ) );
+			PHPUnit::assertFalse( \has_term( $term->term_id, $term->taxonomy, $post ), 'Term found on post' );
 		}
 	}
 
@@ -471,7 +454,7 @@ public function assertPostNotHasTerm( $post, $term ) {
 	 * @param Post|\WP_Post|int $post Post to check.
 	 * @param Term|\WP_Term|int $term Term to check.
 	 */
-	public function assertPostsDoesNotHaveTerm( $post, $term ) {
+	public function assertPostsDoesNotHaveTerm( Post|WP_Post|int $post, Term|WP_Term|int $term ): void {
 		$this->assertPostNotHasTerm( $post, $term );
 	}
 }
diff --git a/src/mantle/testing/concerns/trait-interacts-with-hooks.php b/src/mantle/testing/concerns/trait-interacts-with-hooks.php
index f847fac6..c7ef4750 100644
--- a/src/mantle/testing/concerns/trait-interacts-with-hooks.php
+++ b/src/mantle/testing/concerns/trait-interacts-with-hooks.php
@@ -20,9 +20,9 @@ trait Interacts_With_Hooks {
 	/**
 	 * Storage of the hooks that have been fired.
 	 *
-	 * @var array
+	 * @var array<string, int>
 	 */
-	protected $hooks_fired = [];
+	protected array $hooks_fired = [];
 
 	/**
 	 * Expectation Container
@@ -49,6 +49,7 @@ function( $value ) {
 				}
 
 				$this->hooks_fired[ $filter ]++;
+
 				return $value;
 			}
 		);
@@ -76,14 +77,25 @@ public function interacts_with_hooks_tear_down(): void {
 	 * @return void
 	 */
 	public function assertHookApplied( string $hook, int $count = null ): void {
-		PHPUnit::assertTrue( ! empty( $this->hooks_fired[ $hook ] ) );
+		PHPUnit::assertNotEmpty(
+			$this->hooks_fired[ $hook ] ?? [],
+			"Asserted that [{$hook}] was not fired."
+		);
 
-		if ( null !== $count ) {
+		if ( $count ) {
 			$times_fired = $this->hooks_fired[ $hook ] ?? 0;
+
 			PHPUnit::assertEquals(
 				$count,
-				$this->hooks_fired[ $hook ],
-				"Asserted that [{$hook}] was fired {$count} times when only fired {$times_fired} times."
+				$times_fired,
+				sprintf(
+					'Asserted that [%s] was applied %d %s when only applied %d %s.',
+					$hook,
+					$count,
+					1 === $count ? 'time' : 'times',
+					$times_fired,
+					1 === $times_fired ? 'time' : 'times',
+				),
 			);
 		}
 	}
@@ -95,7 +107,11 @@ public function assertHookApplied( string $hook, int $count = null ): void {
 	 * @return void
 	 */
 	public function assertHookNotApplied( string $hook ): void {
-		PHPUnit::assertTrue( empty( $this->hooks_fired[ $hook ] ) );
+		PHPUnit::assertEquals(
+			0,
+			$this->hooks_fired[ $hook ] ?? 0,
+			"Asserted that [{$hook}] was fired."
+		);
 	}
 
 	/**
diff --git a/tests/testing/concerns/test-interacts-with-hooks.php b/tests/testing/concerns/test-interacts-with-hooks.php
index a2a749fb..2447a3fc 100644
--- a/tests/testing/concerns/test-interacts-with-hooks.php
+++ b/tests/testing/concerns/test-interacts-with-hooks.php
@@ -109,4 +109,14 @@ public function test_hook_return_int() {
 
 		$this->assertIsInt( apply_filters( 'int_hook_to_add', 'not_int' ) );
 	}
+
+	public function test_hook_applied_event() {
+		$this->expectApplied( Example_Event::class )->once();
+
+		$this->app['events']->dispatch( new Example_Event() );
+
+		$this->assertHookApplied( Example_Event::class, 1 );
+	}
 }
+
+class Example_Event {}

From ad9b0d98a807f596370f37146bffffc1e2df272d Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Mon, 2 Oct 2023 15:07:50 -0400
Subject: [PATCH 18/32] CHANGELOG for 0.12.7

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19409894..c340d16e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.12.7 - 2023-10-02
+
+### Added
+
+- Adding date query builder for posts.
+- Adds a trait to easily silence remote requests during testing.
+
+### Changed
+
+- Improve the messaging of assertions when testing.
+
+### Fixed
+
+- Ensure that attribute and action methods are deduplicated in service providers.
+
 ## v0.12.6 - 2023-09-06
 
 ### Fixed

From ab35a63194e21895257ef19723138bfe89d8f3f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 10:32:38 -0500
Subject: [PATCH 19/32] Bump stefanzweifel/git-auto-commit-action from 4 to 5
 (#469)

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4 to 5.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 94df2c33..0cdea233 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -21,7 +21,7 @@ jobs:
           release-notes: ${{ github.event.release.body }}
 
       - name: Commit updated CHANGELOG
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           branch: main
           commit_message: Update CHANGELOG

From 67a3a32b88a0bdb6d5698adae2f3f3688405d6cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 10:32:50 -0500
Subject: [PATCH 20/32] Update phpstan/phpstan requirement from 1.10.35 to
 1.10.41 (#471)

Updates the requirements on [phpstan/phpstan](https://github.com/phpstan/phpstan) to permit the latest version.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.35...1.10.41)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 16c776ce..efd32400 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "mockery/mockery": "^1.6.6",
         "php-stubs/wp-cli-stubs": "^2.8",
         "phpstan/phpdoc-parser": "^1.23.1",
-        "phpstan/phpstan": "1.10.35",
+        "phpstan/phpstan": "1.10.41",
         "phpunit/phpunit": "^9.6.10",
         "predis/predis": "^2.2.0",
         "squizlabs/php_codesniffer": "^3.7",

From ae0641643652fed5d79b99e54a1c739792b96183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Tue, 14 Nov 2023 16:34:19 +0100
Subject: [PATCH 21/32] Fix typos (#467)

---
 CHANGELOG.md                                                | 4 ++--
 src/mantle/container/class-bound-method.php                 | 2 +-
 src/mantle/contracts/interface-application.php              | 2 +-
 src/mantle/events/trait-wordpress-action.php                | 2 +-
 src/mantle/framework/console/class-hook-usage-command.php   | 2 +-
 .../console/generators/class-block-make-command.php         | 4 ++--
 src/mantle/framework/events/class-discover-events.php       | 2 +-
 src/mantle/support/class-arr.php                            | 2 +-
 src/mantle/support/class-driver-manager.php                 | 2 +-
 src/mantle/support/class-reflector.php                      | 2 +-
 src/mantle/testing/concerns/trait-interacts-with-cron.php   | 2 +-
 src/mantle/testing/concerns/trait-rsync-installation.php    | 6 +++---
 tests/support/test-collection.php                           | 6 +++---
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c340d16e..c9169f04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,7 +107,7 @@ No changes, just a re-release to fix a bad tag.
 
 ## v0.11.2 - 2023-07-21
 
-- Add back-support for Wordpress 6.0 when testing.
+- Add back-support for WordPress 6.0 when testing.
 
 ## v0.11.1 - 2023-05-31
 
@@ -222,7 +222,7 @@ No changes, just a re-release to fix a bad tag.
 - Cast the item to an array inside of only_children.
 - Adding keywords to trigger --dev.
 - Separate requires based on what they include.
-- Compatibility layer for Refresh_Database and Installs_Wordpress.
+- Compatibility layer for Refresh_Database and Installs_WordPress.
 
 ## v0.6.1 - 2022-09-20
 
diff --git a/src/mantle/container/class-bound-method.php b/src/mantle/container/class-bound-method.php
index 885cc37a..f6d2006d 100644
--- a/src/mantle/container/class-bound-method.php
+++ b/src/mantle/container/class-bound-method.php
@@ -155,7 +155,7 @@ protected static function get_call_reflector( $callback ) {
 	 * Get the dependency for the given call parameter.
 	 *
 	 * @param  Container            $container Container instance.
-	 * @param  \ReflectionParameter $parameter Reflect Paramater.
+	 * @param  \ReflectionParameter $parameter Reflect Parameter.
 	 * @param  array                $parameters Parameters to pass.
 	 * @param  array                $dependencies Class dependencies.
 	 * @return void
diff --git a/src/mantle/contracts/interface-application.php b/src/mantle/contracts/interface-application.php
index 895f4e75..c0772d12 100644
--- a/src/mantle/contracts/interface-application.php
+++ b/src/mantle/contracts/interface-application.php
@@ -191,7 +191,7 @@ public function booted( callable $callback ): static;
 	public function terminating( callable $callback ): static;
 
 	/**
-	 * Termine the application.
+	 * Terminate the application.
 	 *
 	 * @return void
 	 */
diff --git a/src/mantle/events/trait-wordpress-action.php b/src/mantle/events/trait-wordpress-action.php
index 0f6c1471..628a9e6e 100644
--- a/src/mantle/events/trait-wordpress-action.php
+++ b/src/mantle/events/trait-wordpress-action.php
@@ -157,7 +157,7 @@ protected function validate_argument_type( $argument, ReflectionParameter $param
 			 * to that event will pass the argument down to the callback for the action/filter.
 			 *
 			 * @param mixed               $argument Argument value.
-			 * @param ReflectionParameter $parameter Callback paramater.
+			 * @param ReflectionParameter $parameter Callback parameter.
 			 */
 			$modified_argument = $this->dispatch( 'mantle-typehint-resolve:' . $type->getName(), [ null, $argument, $parameter ] );
 
diff --git a/src/mantle/framework/console/class-hook-usage-command.php b/src/mantle/framework/console/class-hook-usage-command.php
index d326f0f0..5171519b 100644
--- a/src/mantle/framework/console/class-hook-usage-command.php
+++ b/src/mantle/framework/console/class-hook-usage-command.php
@@ -212,7 +212,7 @@ protected function read_file( string $file ): Collection {
 	}
 
 	/**
-	 * Detrmine if the cache should be used.
+	 * Determine if the cache should be used.
 	 *
 	 * @return bool
 	 */
diff --git a/src/mantle/framework/console/generators/class-block-make-command.php b/src/mantle/framework/console/generators/class-block-make-command.php
index 480f386b..9510c32c 100644
--- a/src/mantle/framework/console/generators/class-block-make-command.php
+++ b/src/mantle/framework/console/generators/class-block-make-command.php
@@ -309,7 +309,7 @@ protected function get_blocks_path(): string {
 	}
 
 	/**
-	 * Get the base path for the genereated block.
+	 * Get the base path for the generated block.
 	 *
 	 * @param string $name The block name.
 	 * @return string
@@ -328,7 +328,7 @@ protected function get_views_path(): string {
 	}
 
 	/**
-	 * Get the base path for the genereated block.
+	 * Get the base path for the generated block.
 	 *
 	 * @param string $namespace The block namespace.
 	 * @return string
diff --git a/src/mantle/framework/events/class-discover-events.php b/src/mantle/framework/events/class-discover-events.php
index 4c3b695f..47feddac 100644
--- a/src/mantle/framework/events/class-discover-events.php
+++ b/src/mantle/framework/events/class-discover-events.php
@@ -128,7 +128,7 @@ protected static function get_listener_events( $listeners, string $base_path ):
 				}
 
 				$listener_events[ $listener->name . '@' . $method->name ] = [
-					Reflector::get_paramater_class_names(
+					Reflector::get_parameter_class_names(
 						$method->getParameters()[0]
 					),
 					$priority,
diff --git a/src/mantle/support/class-arr.php b/src/mantle/support/class-arr.php
index 26b27312..9614a77b 100644
--- a/src/mantle/support/class-arr.php
+++ b/src/mantle/support/class-arr.php
@@ -126,7 +126,7 @@ public static function dot( $array, string $prepend = '' ): array {
 	 * Get all of the given array except for a specified array of keys.
 	 *
 	 * @param  array        $array Array to process.
-	 * @param  array|string $keys Keys toi filter by.
+	 * @param  array|string $keys Keys to filter by.
 	 * @return array
 	 */
 	public static function except( array $array, $keys ): array {
diff --git a/src/mantle/support/class-driver-manager.php b/src/mantle/support/class-driver-manager.php
index 3fd3e4b3..2b2893f6 100644
--- a/src/mantle/support/class-driver-manager.php
+++ b/src/mantle/support/class-driver-manager.php
@@ -11,7 +11,7 @@
 use InvalidArgumentException;
 
 /**
- * Driver Manager for managing multiple stores and plugable drivers.
+ * Driver Manager for managing multiple stores and pluggable drivers.
  */
 abstract class Driver_Manager {
 	/**
diff --git a/src/mantle/support/class-reflector.php b/src/mantle/support/class-reflector.php
index 6437e6c5..c35b7e6b 100644
--- a/src/mantle/support/class-reflector.php
+++ b/src/mantle/support/class-reflector.php
@@ -50,7 +50,7 @@ public static function get_parameter_class_name( $parameter ) {
 	 * @param  \ReflectionParameter $parameter
 	 * @return array
 	 */
-	public static function get_paramater_class_names( $parameter ) {
+	public static function get_parameter_class_names( $parameter ) {
 		$type = $parameter->getType();
 
 		if ( ! $type instanceof ReflectionUnionType ) {
diff --git a/src/mantle/testing/concerns/trait-interacts-with-cron.php b/src/mantle/testing/concerns/trait-interacts-with-cron.php
index fa8e0720..314a4ddc 100644
--- a/src/mantle/testing/concerns/trait-interacts-with-cron.php
+++ b/src/mantle/testing/concerns/trait-interacts-with-cron.php
@@ -38,7 +38,7 @@ public function assertInCronQueue( string $action, array $args = [] ): void {
 	}
 
 	/**
-	 * Assert tha an action is not in a cron queue.
+	 * Assert that an action is not in a cron queue.
 	 *
 	 * @param string $action Action hook of the event.
 	 * @param array  $args Arguments for the cron queue event.
diff --git a/src/mantle/testing/concerns/trait-rsync-installation.php b/src/mantle/testing/concerns/trait-rsync-installation.php
index ca5589d2..7f3c2bea 100644
--- a/src/mantle/testing/concerns/trait-rsync-installation.php
+++ b/src/mantle/testing/concerns/trait-rsync-installation.php
@@ -136,7 +136,7 @@ public function maybe_rsync( string $to = null, string $from = null ): static {
 	 * Maybe rsync the codebase to the wp-content within WordPress.
 	 *
 	 * Will attempt to locate the wp-content directory relative to the current
-	 * directory. As a fallback, it will assumme it is being called from either
+	 * directory. As a fallback, it will assume it is being called from either
 	 * /wp-content/plugin/:plugin/tests OR /wp-content/themes/:theme/tests. Will
 	 * rsync the codebase from the wp-content level to the root of the WordPress
 	 * installation. Also will attempt to locate the wp-content directory relative
@@ -349,7 +349,7 @@ protected function perform_rsync_testsuite() {
 		// Install WordPress at the base installation if it doesn't exist yet.
 		if ( ! is_dir( $base_install_path ) || ! is_file( "{$base_install_path}/wp-load.php" ) ) {
 			Utils::info(
-				"Installating WordPress at <em>{$base_install_path}</em> ...",
+				"Installing WordPress at <em>{$base_install_path}</em> ...",
 				'Install Rsync'
 			);
 
@@ -484,7 +484,7 @@ protected function get_phpunit_command(): string {
 			// Use the first argument and translate it to the rsync-ed path.
 			$executable = $this->translate_location( $args[0] );
 
-			// Attempt to fallback to the phpunit binrary reference in PHP_SELF. This
+			// Attempt to fallback to the phpunit binary reference in PHP_SELF. This
 			// would be the one used to invoke the current script. With that, we can
 			// translate it to the new location in the rsync-ed WordPress
 			// installation.
diff --git a/tests/support/test-collection.php b/tests/support/test-collection.php
index 66d4c0aa..1db26c81 100644
--- a/tests/support/test-collection.php
+++ b/tests/support/test-collection.php
@@ -77,8 +77,8 @@ public function testFirstWhere($collection)
 
 		$this->assertSame('book', $data->first_where('material', 'paper')['type']);
 		$this->assertSame('gasket', $data->first_where('material', 'rubber')['type']);
-		$this->assertNull($data->first_where('material', 'nonexistant'));
-		$this->assertNull($data->first_where('nonexistant', 'key'));
+		$this->assertNull($data->first_where('material', 'nonexistent'));
+		$this->assertNull($data->first_where('nonexistent', 'key'));
 	}
 
 	/**
@@ -3623,7 +3623,7 @@ public function testCollectionFromTraversableWithKeys($collection)
 	/**
 	 * @dataProvider collectionClassProvider
 	 */
-	public function testSplitCollectionWithADivisableCount($collection)
+	public function testSplitCollectionWithADivisibleCount($collection)
 	{
 		$data = new $collection(['a', 'b', 'c', 'd']);
 

From 5c37b70f86aa991bdad58302ee9df96d64e4972d Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 14 Nov 2023 10:35:47 -0500
Subject: [PATCH 22/32] Ensure factories can be used with data providers (#462)

* Overhauling the generics of factories to return the proper type

* Adding a global constant to make testing easier

* Include some functionality from core

* Ensure that post factories work in data providers

* Switch to get_comment_delimited_block_content() to compile blocks

* Ensure that a new line is added before/after content
---
 phpcs.xml                                     |  1 +
 .../class-factory-service-provider.php        |  2 +-
 .../factory/class-attachment-factory.php      |  9 ++-
 .../database/factory/class-blog-factory.php   |  8 ++-
 .../factory/class-comment-factory.php         |  6 +-
 .../factory/class-factory-container.php       | 65 +++++++++++++------
 src/mantle/database/factory/class-factory.php | 20 +++---
 .../database/factory/class-fluent-factory.php | 12 ++--
 .../factory/class-network-factory.php         |  8 ++-
 .../database/factory/class-post-factory.php   | 11 +++-
 .../database/factory/class-term-factory.php   |  8 ++-
 .../database/factory/class-user-factory.php   |  8 ++-
 .../database/model/class-attachment.php       |  3 +-
 src/mantle/database/model/class-comment.php   |  2 +
 src/mantle/database/model/class-model.php     |  3 +
 src/mantle/database/model/class-post.php      |  3 +
 src/mantle/database/model/class-site.php      |  2 +
 src/mantle/database/model/class-term.php      |  1 +
 src/mantle/database/model/class-user.php      |  2 +
 .../model/concerns/trait-has-factory.php      |  8 ++-
 src/mantle/faker/class-faker-provider.php     | 20 ++----
 src/mantle/testing/wordpress-bootstrap.php    |  8 +++
 tests/database/factory/test-factory.php       |  6 +-
 .../factory/test-unit-testing-factory.php     | 32 +++++++--
 24 files changed, 172 insertions(+), 76 deletions(-)

diff --git a/phpcs.xml b/phpcs.xml
index eb25c772..42444f7c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -28,6 +28,7 @@
 		<exclude name="PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection" />
 		<exclude name="PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.Changed" />
 		<exclude name="Squiz.Commenting.FunctionComment.IncorrectTypeHint" />
+		<exclude name="Generic.Commenting.DocComment.MissingShort" />
 	</rule>
 
 	<rule ref="Generic.Arrays.DisallowLongArraySyntax" />
diff --git a/src/mantle/database/class-factory-service-provider.php b/src/mantle/database/class-factory-service-provider.php
index 23d948af..7ec98f2f 100644
--- a/src/mantle/database/class-factory-service-provider.php
+++ b/src/mantle/database/class-factory-service-provider.php
@@ -46,7 +46,7 @@ function ( $app, $parameters ) {
 				$locale = config( 'app.faker_locale', Factory::DEFAULT_LOCALE );
 
 				if ( ! isset( static::$fakers[ $locale ] ) ) {
-					static::$fakers[ $locale ] = Factory::create();
+					static::$fakers[ $locale ] = Factory::create( $locale );
 
 					static::$fakers[ $locale ]->addProvider(
 						new Faker_Provider( static::$fakers[ $locale ] )
diff --git a/src/mantle/database/factory/class-attachment-factory.php b/src/mantle/database/factory/class-attachment-factory.php
index 4363966b..d5018746 100644
--- a/src/mantle/database/factory/class-attachment-factory.php
+++ b/src/mantle/database/factory/class-attachment-factory.php
@@ -8,7 +8,6 @@
 namespace Mantle\Database\Factory;
 
 use Closure;
-use Faker\Generator;
 use Mantle\Contracts\Database\Core_Object;
 use Mantle\Database\Model\Attachment;
 use RuntimeException;
@@ -19,7 +18,11 @@
 /**
  * Attachment Factory
  *
- * @template TObject of \Mantle\Database\Model\Attachment
+ * @template TModel of \Mantle\Database\Model\Attachment
+ * @template TObject of \WP_Post
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class Attachment_Factory extends Post_Factory {
 	use Concerns\Generates_Images;
@@ -27,7 +30,7 @@ class Attachment_Factory extends Post_Factory {
 	/**
 	 * Model to use when creating objects.
 	 *
-	 * @var class-string
+	 * @var class-string<TModel>
 	 */
 	protected string $model = Attachment::class;
 
diff --git a/src/mantle/database/factory/class-blog-factory.php b/src/mantle/database/factory/class-blog-factory.php
index f2a76ff7..29ed305c 100644
--- a/src/mantle/database/factory/class-blog-factory.php
+++ b/src/mantle/database/factory/class-blog-factory.php
@@ -14,13 +14,17 @@
 /**
  * Blog Factory
  *
- * @template TObject of \Mantle\Database\Model\Site
+ * @template TModel of \Mantle\Database\Model\Site
+ * @template TObject of \WP_Site
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class Blog_Factory extends Factory {
 	/**
 	 * Model to use when creating objects.
 	 *
-	 * @var class-string
+	 * @var class-string<TModel>
 	 */
 	protected string $model = Site::class;
 
diff --git a/src/mantle/database/factory/class-comment-factory.php b/src/mantle/database/factory/class-comment-factory.php
index 3f8abb31..b71189db 100644
--- a/src/mantle/database/factory/class-comment-factory.php
+++ b/src/mantle/database/factory/class-comment-factory.php
@@ -14,7 +14,11 @@
 /**
  * Term Factory
  *
- * @template TObject of \Mantle\Database\Model\Comment
+ * @template TModel of \Mantle\Database\Model\Comment
+ * @template TObject of \WP_Comment
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class Comment_Factory extends Factory {
 	/**
diff --git a/src/mantle/database/factory/class-factory-container.php b/src/mantle/database/factory/class-factory-container.php
index 1e324cef..ff2e8923 100644
--- a/src/mantle/database/factory/class-factory-container.php
+++ b/src/mantle/database/factory/class-factory-container.php
@@ -7,7 +7,9 @@
 
 namespace Mantle\Database\Factory;
 
+use Faker\Generator;
 use Mantle\Contracts\Container;
+use Mantle\Faker\Faker_Provider;
 
 /**
  * Collect all the Database Factories for IDE Support
@@ -21,72 +23,72 @@ class Factory_Container {
 	/**
 	 * Attachment Factory
 	 *
-	 * @var Attachment_Factory<\WP_Post|\Mantle\Database\Model\Attachment>
+	 * @var Attachment_Factory<\Mantle\Database\Model\Attachment, \WP_Post, \WP_Post>
 	 */
-	public $attachment;
+	public Attachment_Factory $attachment;
 
 	/**
 	 * Blog Factory
 	 *
-	 * @var Blog_Factory<\WP_Site|\Mantle\Database\Model\Site>
+	 * @var Blog_Factory<\Mantle\Database\Model\Site, \WP_Site, \WP_Site>
 	 */
-	public $blog;
+	public Blog_Factory $blog;
 
 	/**
 	 * Category Factory
 	 *
-	 * @var Term_Factory<\WP_Term|\Mantle\Database\Model\Term>
+	 * @var Term_Factory<\Mantle\Database\Model\Term, \WP_Term, \WP_Term>
 	 */
-	public $category;
+	public Term_Factory $category;
 
 	/**
 	 * Comment Factory
 	 *
-	 * @var Comment_Factory<\WP_Comment>
+	 * @var Comment_Factory<\Mantle\Database\Model\Comment, \WP_Comment, \WP_Comment>
 	 */
-	public $comment;
+	public Comment_Factory $comment;
 
 	/**
 	 * Network Factory
 	 *
-	 * @var Network_Factory<\WP_Network>
+	 * @var Network_Factory<null, \WP_Network>
 	 */
-	public $network;
+	public Network_Factory $network;
 
 	/**
 	 * Page Factory
 	 *
-	 * @var Post_Factory<\WP_Post|\Mantle\Database\Model\Post>
+	 * @var Post_Factory<\Mantle\Database\Model\Post, \WP_Post, \WP_Post>
 	 */
 	public $page;
 
 	/**
 	 * Post Factory
 	 *
-	 * @var Post_Factory<\WP_Post|\Mantle\Database\Model\Post>
+	 * @var Post_Factory<\Mantle\Database\Model\Post, \WP_Post, \WP_Post>
 	 */
-	public $post;
+	public Post_Factory $post;
 
 	/**
 	 * Tag Factory
 	 *
-	 * @var Term_Factory<\WP_Term|\Mantle\Database\Model\Term>
+	 * @var Term_Factory<\Mantle\Database\Model\Term, \WP_Term, \WP_Term>
 	 */
-	public $tag;
+	public Term_Factory $tag;
 
 	/**
 	 * Term Factory (alias for Tag Factory).
 	 *
-	 * @var Term_Factory<\WP_Term|\Mantle\Database\Model\Term>
+	 * @var Term_Factory<\Mantle\Database\Model\Term, \WP_Term, \WP_Term>
 	 */
-	public $term;
+	public Term_Factory $term;
 
 	/**
 	 * User Factory
 	 *
-	 * @var User_Factory<\WP_User|\Mantle\Database\Model\User>
+	 * @var User_Factory<\Mantle\Database\Model\User, \WP_User, \WP_User>
 	 */
-	public $user;
+	public User_Factory $user;
 
 	/**
 	 * Constructor.
@@ -94,6 +96,8 @@ class Factory_Container {
 	 * @param Container $container Container instance.
 	 */
 	public function __construct( Container $container ) {
+		$this->setup_faker( $container );
+
 		$this->attachment = $container->make( Attachment_Factory::class );
 		$this->category   = $container->make( Term_Factory::class, [ 'taxonomy' => 'category' ] );
 		$this->comment    = $container->make( Comment_Factory::class );
@@ -108,4 +112,27 @@ public function __construct( Container $container ) {
 			$this->network = $container->make( Network_Factory::class );
 		}
 	}
+
+	/**
+	 * Set up the Faker instance in the container.
+	 *
+	 * Primarily used when faker/factory is called from a data provider and the
+	 * application hasn't been setup yet.
+	 *
+	 * @param Container $container Container instance.
+	 */
+	protected function setup_faker( Container $container ): void {
+		$container->singleton_if(
+			Generator::class,
+			function () {
+				$generator = \Faker\Factory::create();
+
+				$generator->unique();
+
+				$generator->addProvider( new Faker_Provider( $generator ) );
+
+				return $generator;
+			},
+		);
+	}
 }
diff --git a/src/mantle/database/factory/class-factory.php b/src/mantle/database/factory/class-factory.php
index c7471684..767fd590 100644
--- a/src/mantle/database/factory/class-factory.php
+++ b/src/mantle/database/factory/class-factory.php
@@ -24,9 +24,11 @@
 /**
  * Base Factory
  *
- * @template TObject of \Mantle\Database\Model\Model
+ * @template TModel of \Mantle\Database\Model\Model
+ * @template TObject
+ * @template TReturnValue
  *
- * @method \Mantle\Database\Factory\Fluent_Factory<TObject> count(int $count)
+ * @method \Mantle\Database\Factory\Fluent_Factory<TModel, TObject, TReturnValue> count(int $count)
  */
 abstract class Factory {
 	use Concerns\Resolves_Factories,
@@ -74,7 +76,7 @@ abstract public function definition(): array;
 	 * Retrieves an object by ID.
 	 *
 	 * @param int $object_id The object ID.
-	 * @return mixed
+	 * @return TModel|TObject|null
 	 */
 	abstract public function get_object_by_id( int $object_id );
 
@@ -91,7 +93,7 @@ public function create( array $args = [] ): mixed {
 	/**
 	 * Generate models from the factory.
 	 *
-	 * @return static
+	 * @return static<TModel, TObject, TModel>
 	 */
 	public function as_models() {
 		return tap(
@@ -103,7 +105,7 @@ public function as_models() {
 	/**
 	 * Generate core WordPress objects from the factory.
 	 *
-	 * @return static
+	 * @return static<TModel, TObject, TObject>
 	 */
 	public function as_objects() {
 		return tap(
@@ -145,8 +147,10 @@ public function without_middleware() {
 	 *
 	 * @throws \InvalidArgumentException If the model does not extend from the base model class.
 	 *
-	 * @param class-string<TObject> $model The model to use.
-	 * @return static
+	 * @template TNewModel of \Mantle\Database\Model\Model
+	 *
+	 * @param class-string<TNewModel> $model The model to use.
+	 * @return static<TNewModel, TObject, TReturnValue>
 	 */
 	public function with_model( string $model ) {
 		// Validate that model extends from the base model class.
@@ -210,7 +214,7 @@ public function create_many( int $count, array $args = [] ) {
 	 * Creates an object and returns its object.
 	 *
 	 * @param array $args Optional. The arguments for the object to create. Default is empty array.
-	 * @return TObject The created object.
+	 * @return TReturnValue The created object.
 	 */
 	public function create_and_get( array $args = [] ) {
 		return $this->get_object_by_id( $this->create( $args ) );
diff --git a/src/mantle/database/factory/class-fluent-factory.php b/src/mantle/database/factory/class-fluent-factory.php
index 653306c1..8b45d878 100644
--- a/src/mantle/database/factory/class-fluent-factory.php
+++ b/src/mantle/database/factory/class-fluent-factory.php
@@ -18,7 +18,11 @@
  * Extends upon the factory that is included with Mantle (one that is designed
  * to mirror WordPress) and builds upon it to provide a fluent interface.
  *
- * @template TObject of \Mantle\Database\Model\Model
+ * @template TModel of \Mantle\Database\Model\Model
+ * @template TObject
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class Fluent_Factory extends Factory {
 	/**
@@ -57,7 +61,7 @@ public function count( int $count ): static {
 	 * Create one or multiple objects and return the IDs.
 	 *
 	 * @param array $args Arguments to pass to the factory.
-	 * @return \Mantle\Support\Collection<int, mixed>|mixed
+	 * @return \Mantle\Support\Collection<int, TReturnValue>|mixed
 	 */
 	public function create( array $args = [] ): mixed {
 		if ( 1 === $this->count ) {
@@ -71,7 +75,7 @@ public function create( array $args = [] ): mixed {
 	 * Create one or multiple objects and return the objects.
 	 *
 	 * @param array $args Arguments to pass to the factory.
-	 * @return \Mantle\Support\Collection<int, TObject>|TObject
+	 * @return \Mantle\Support\Collection<int, TReturnValue>|TReturnValue
 	 */
 	public function create_and_get( array $args = [] ): mixed {
 		if ( 1 === $this->count ) {
@@ -98,7 +102,7 @@ public function definition(): array {
 	 * Retrieves an object by ID.
 	 *
 	 * @param mixed $object_id The object ID.
-	 * @return TObject
+	 * @return TReturnValue
 	 */
 	public function get_object_by_id( mixed $object_id ): mixed {
 		return $this->factory->get_object_by_id( $object_id );
diff --git a/src/mantle/database/factory/class-network-factory.php b/src/mantle/database/factory/class-network-factory.php
index 65f5b802..f708462f 100644
--- a/src/mantle/database/factory/class-network-factory.php
+++ b/src/mantle/database/factory/class-network-factory.php
@@ -7,12 +7,14 @@
 
 namespace Mantle\Database\Factory;
 
-use Faker\Generator;
-
 /**
  * Network Factory
  *
- * @template TObject
+ * @template TModel
+ * @template TObject of \WP_Network
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class Network_Factory extends Factory {
 	/**
diff --git a/src/mantle/database/factory/class-post-factory.php b/src/mantle/database/factory/class-post-factory.php
index c69f53c9..1ad971b9 100644
--- a/src/mantle/database/factory/class-post-factory.php
+++ b/src/mantle/database/factory/class-post-factory.php
@@ -19,7 +19,11 @@
 /**
  * Post Factory
  *
- * @template TObject of \Mantle\Database\Model\Post
+ * @template TModel of \Mantle\Database\Model\Post
+ * @template TObject
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class Post_Factory extends Factory {
 	use Concerns\With_Meta;
@@ -27,7 +31,7 @@ class Post_Factory extends Factory {
 	/**
 	 * Model to use when creating objects.
 	 *
-	 * @var class-string
+	 * @var class-string<TModel>
 	 */
 	protected string $model = Post::class;
 
@@ -44,7 +48,7 @@ public function __construct( Generator $faker, public string $post_type = 'post'
 	/**
 	 * Create a new factory instance to create posts with a set of terms.
 	 *
-	 * @param array<int, \WP_Term|int|string>|\WP_Term|int|string ...$terms Terms to assign to the post.
+	 * @param array<int|string, \WP_Term|int|string|array<string, mixed>>|\WP_Term|int|string ...$terms Terms to assign to the post.
 	 * @return static
 	 */
 	public function with_terms( ...$terms ): static {
@@ -172,6 +176,7 @@ public function create_ordered_set(
 	 *
 	 * @param int $object_id The object ID.
 	 * @return Post|WP_Post|null
+	 * @phpstan-return TModel|TObject|null
 	 */
 	public function get_object_by_id( int $object_id ) {
 		return $this->as_models
diff --git a/src/mantle/database/factory/class-term-factory.php b/src/mantle/database/factory/class-term-factory.php
index 52db8f8c..4d49ecab 100644
--- a/src/mantle/database/factory/class-term-factory.php
+++ b/src/mantle/database/factory/class-term-factory.php
@@ -16,7 +16,11 @@
 /**
  * Term Factory
  *
- * @template TObject of \Mantle\Database\Model\Term
+ * @template TModel of \Mantle\Database\Model\Term
+ * @template TObject of \WP_Term
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class Term_Factory extends Factory {
 	use Concerns\With_Meta;
@@ -24,7 +28,7 @@ class Term_Factory extends Factory {
 	/**
 	 * Model to use when creating objects.
 	 *
-	 * @var class-string
+	 * @var class-string<TModel>
 	 */
 	protected string $model = Term::class;
 
diff --git a/src/mantle/database/factory/class-user-factory.php b/src/mantle/database/factory/class-user-factory.php
index ce41b3d4..927057ad 100644
--- a/src/mantle/database/factory/class-user-factory.php
+++ b/src/mantle/database/factory/class-user-factory.php
@@ -14,7 +14,11 @@
 /**
  * User Factory
  *
- * @template TObject of \Mantle\Database\Model\User
+ * @template TModel of \Mantle\Database\Model\User
+ * @template TObject of \WP_User
+ * @template TReturnValue
+ *
+ * @extends Factory<TModel, TObject, TReturnValue>
  */
 class User_Factory extends Factory {
 	use Concerns\With_Meta;
@@ -22,7 +26,7 @@ class User_Factory extends Factory {
 	/**
 	 * Model to use when creating objects.
 	 *
-	 * @var class-string
+	 * @var class-string<TModel>
 	 */
 	protected string $model = User::class;
 
diff --git a/src/mantle/database/model/class-attachment.php b/src/mantle/database/model/class-attachment.php
index d92ac3be..5edf4be8 100644
--- a/src/mantle/database/model/class-attachment.php
+++ b/src/mantle/database/model/class-attachment.php
@@ -7,11 +7,12 @@
 
 namespace Mantle\Database\Model;
 
-use Mantle\Contracts;
 use Mantle\Facade\Storage;
 
 /**
  * Attachment Model
+ *
+ * @method static \Mantle\Database\Factory\Post_Factory<static, \WP_Post, static> factory( array|callable|null $state = null )
  */
 class Attachment extends Post {
 	/**
diff --git a/src/mantle/database/model/class-comment.php b/src/mantle/database/model/class-comment.php
index 7df3c992..60fe3c34 100644
--- a/src/mantle/database/model/class-comment.php
+++ b/src/mantle/database/model/class-comment.php
@@ -12,6 +12,8 @@
 
 /**
  * Comment Model
+ *
+ * @method static \Mantle\Database\Factory\Post_Factory<static, \WP_Comment, static> factory( array|callable|null $state = null )
  */
 class Comment extends Model implements Contracts\Database\Core_Object, Contracts\Database\Model_Meta, Contracts\Database\Updatable {
 	use Meta\Model_Meta,
diff --git a/src/mantle/database/model/class-model.php b/src/mantle/database/model/class-model.php
index b07ebccb..470b714c 100644
--- a/src/mantle/database/model/class-model.php
+++ b/src/mantle/database/model/class-model.php
@@ -25,6 +25,8 @@
 /**
  * Database Model
  *
+ * @template TModelObject of object
+ *
  * @method static \Mantle\Support\Collection all()
  * @method static static first()
  * @method static static first_or_fail()
@@ -41,6 +43,7 @@ abstract class Model implements ArrayAccess, Arrayable, Jsonable, JsonSerializab
 		Concerns\Has_Aliases,
 		Concerns\Has_Attributes,
 		Concerns\Has_Events,
+		/** @use Concerns\Has_Factory<TModelObject> */
 		Concerns\Has_Factory,
 		Concerns\Has_Global_Scopes,
 		Concerns\Has_Relationships;
diff --git a/src/mantle/database/model/class-post.php b/src/mantle/database/model/class-post.php
index fc3c7021..f6d72c87 100644
--- a/src/mantle/database/model/class-post.php
+++ b/src/mantle/database/model/class-post.php
@@ -17,6 +17,8 @@
 /**
  * Post Model
  *
+ * @extends Model<\WP_Post>
+ *
  * @property int $comment_count
  * @property int $ID
  * @property int $menu_order
@@ -49,6 +51,7 @@
  * @property string $status Alias to post_status.
  * @property string $title Alias to post_title.
  *
+ * @method static \Mantle\Database\Factory\Post_Factory<static, \WP_Post, static> factory( array|callable|null $state = null )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> anyStatus()
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> where( string|array $attribute, mixed $value )
  * @method static \Mantle\Database\Query\Post_Query_Builder<static> whereId( int $id )
diff --git a/src/mantle/database/model/class-site.php b/src/mantle/database/model/class-site.php
index 0d328cfe..bd75aa39 100644
--- a/src/mantle/database/model/class-site.php
+++ b/src/mantle/database/model/class-site.php
@@ -12,6 +12,8 @@
 
 /**
  * Site Model
+ *
+ * @method static \Mantle\Database\Factory\Post_Factory<static, \WP_Site, static> factory( array|callable|null $state = null )
  */
 class Site extends Model implements Contracts\Database\Core_Object, Contracts\Database\Updatable {
 	/**
diff --git a/src/mantle/database/model/class-term.php b/src/mantle/database/model/class-term.php
index 94aa3eef..19fa2771 100644
--- a/src/mantle/database/model/class-term.php
+++ b/src/mantle/database/model/class-term.php
@@ -22,6 +22,7 @@
  * @property string $slug
  * @property string $taxonomy
  *
+ * @method static \Mantle\Database\Factory\Term_Factory<static, \WP_Term, static> factory( array|callable|null $state = null )
  * @method static \Mantle\Database\Query\Term_Query_Builder<static> whereId( int $id )
  * @method static \Mantle\Database\Query\Term_Query_Builder<static> whereName(string $name)
  * @method static \Mantle\Database\Query\Term_Query_Builder<static> whereSlug(string $slug)
diff --git a/src/mantle/database/model/class-user.php b/src/mantle/database/model/class-user.php
index aceb6be7..8a429921 100644
--- a/src/mantle/database/model/class-user.php
+++ b/src/mantle/database/model/class-user.php
@@ -12,6 +12,8 @@
 
 /**
  * User Model
+ *
+ * @method static \Mantle\Database\Factory\User_Factory<static, \WP_User, static> factory( array|callable|null $state = null )
  */
 class User extends Model implements Contracts\Database\Core_Object, Contracts\Database\Model_Meta, Contracts\Database\Updatable {
 	use Meta\Model_Meta,
diff --git a/src/mantle/database/model/concerns/trait-has-factory.php b/src/mantle/database/model/concerns/trait-has-factory.php
index 04147b46..1ba2a18b 100644
--- a/src/mantle/database/model/concerns/trait-has-factory.php
+++ b/src/mantle/database/model/concerns/trait-has-factory.php
@@ -12,14 +12,16 @@
 use Mantle\Database\Factory\Term_Factory;
 
 /**
- * Model Database Factory
+ * Trait to add a factory to a model.
+ *
+ * @template TObject
  */
 trait Has_Factory {
 	/**
 	 * Create a builder for the model.
 	 *
 	 * @param array|callable $state Default state array or callable that will be invoked to set state.
-	 * @return \Mantle\Database\Factory\Factory<static>
+	 * @return \Mantle\Database\Factory\Factory<static, TObject, static>
 	 */
 	public static function factory( array|callable|null $state = null ): Factory {
 		$factory = static::new_factory() ?: Factory::factory_for_model( static::class );
@@ -43,7 +45,7 @@ public static function factory( array|callable|null $state = null ): Factory {
 	 *
 	 * Optional: allows for the model factory to be overridden by application code.
 	 *
-	 * @return \Mantle\Database\Factory\Factory<static>|null
+	 * @return \Mantle\Database\Factory\Factory<static, TObject, static>|null
 	 */
 	protected static function new_factory(): ?Factory {
 		return null;
diff --git a/src/mantle/faker/class-faker-provider.php b/src/mantle/faker/class-faker-provider.php
index 37bd9724..bf1f82d3 100644
--- a/src/mantle/faker/class-faker-provider.php
+++ b/src/mantle/faker/class-faker-provider.php
@@ -51,22 +51,12 @@ public function paragraph_blocks( int $count = 3, bool $as_text = true ) {
 	 * @param array  $attributes Attributes for the block.
 	 * @return string
 	 */
-	public static function block( string $block_name, string $content = '', array $attributes = [] ) {
-		$attributes = ! empty( $attributes ) ? \wp_json_encode( $attributes ) . ' ' : '';
-
-		if ( empty( $content ) ) {
-			return sprintf(
-				'<!-- wp:%s %s/-->',
-				$block_name,
-				$attributes
-			);
+	public static function block( string $block_name, string $content = '', array $attributes = [] ): string {
+		// Add a newline before and after the content.
+		if ( ! empty( $content ) ) {
+			$content = "\n{$content}\n";
 		}
 
-		return sprintf(
-			'<!-- wp:%1$s %2$s-->%3$s<!-- /wp:%1$s -->',
-			$block_name,
-			$attributes,
-			PHP_EOL . $content . PHP_EOL
-		);
+		return get_comment_delimited_block_content( $block_name, $attributes, $content );
 	}
 }
diff --git a/src/mantle/testing/wordpress-bootstrap.php b/src/mantle/testing/wordpress-bootstrap.php
index d46f894d..34932796 100644
--- a/src/mantle/testing/wordpress-bootstrap.php
+++ b/src/mantle/testing/wordpress-bootstrap.php
@@ -11,6 +11,8 @@
 
 use function Mantle\Testing\tests_add_filter;
 
+defined( 'MANTLE_IS_TESTING' ) || define( 'MANTLE_IS_TESTING', true );
+
 require_once __DIR__ . '/class-utils.php';
 require_once __DIR__ . '/class-wp-die.php';
 
@@ -174,6 +176,12 @@
 // Use the Spy REST Server instead of default.
 tests_add_filter( 'wp_rest_server_class', [ Utils::class, 'wp_rest_server_class_filter' ], PHP_INT_MAX );
 
+// Prevent updating translations asynchronously.
+tests_add_filter( 'async_update_translation', '__return_false' );
+
+// Disable background updates.
+tests_add_filter( 'automatic_updater_disabled', '__return_true' );
+
 // Load WordPress.
 require_once ABSPATH . '/wp-settings.php';
 
diff --git a/tests/database/factory/test-factory.php b/tests/database/factory/test-factory.php
index 4d983b6b..67cd6992 100644
--- a/tests/database/factory/test-factory.php
+++ b/tests/database/factory/test-factory.php
@@ -6,11 +6,13 @@
 use Mantle\Database\Model;
 use Mantle\Testing\Framework_Test_Case;
 
+/**
+ * @group factory
+ */
 class Test_Factory extends Framework_Test_Case {
 	public function test_create_basic_model() {
 		$factory = Testable_Post::factory();
 
-		$this->assertInstanceOf( Factory\Factory::class, $factory );
 		$this->assertInstanceOf( Factory\Post_Factory::class, $factory );
 
 		$post = $factory->create_and_get();
@@ -154,7 +156,7 @@ class Testable_Post extends Model\Post {
 }
 
 /**
- * @method static Testable_Post_Factory factory()
+ * @method static Testable_Post_Factory<static, \WP_Post, static> factory()
  */
 class Testable_Post_With_Factory extends Model\Post {
 	public static $object_name = 'post';
diff --git a/tests/database/factory/test-unit-testing-factory.php b/tests/database/factory/test-unit-testing-factory.php
index 7c0c3c3a..54cf3b81 100644
--- a/tests/database/factory/test-unit-testing-factory.php
+++ b/tests/database/factory/test-unit-testing-factory.php
@@ -14,6 +14,8 @@
  * Test case with the focus of testing the unit testing factory that mirrors
  * WordPress core's factories. The factories here should be drop-in replacements
  * for core's factories with some sugar on top.
+ *
+ * @group factory
  */
 class Test_Unit_Testing_Factory extends Framework_Test_Case {
 	use With_Faker;
@@ -21,7 +23,7 @@ class Test_Unit_Testing_Factory extends Framework_Test_Case {
 	public function test_post_factory() {
 		$this->assertInstanceOf( \WP_Post::class, static::factory()->post->create_and_get() );
 
-		$posts = static::factory()->post->create_many(
+		$post_ids = static::factory()->post->create_many(
 			10,
 			[
 				'post_type'   => 'post',
@@ -29,12 +31,12 @@ public function test_post_factory() {
 			]
 		);
 
-		$this->assertCount( 10, $posts );
-		foreach ( $posts as $post_id ) {
+		$this->assertCount( 10, $post_ids );
+		foreach ( $post_ids as $post_id ) {
 			$this->assertIsInt( $post_id );
 		}
 
-		$this->assertEquals( 'draft', get_post_status( array_shift( $posts ) ) );
+		$this->assertEquals( 'draft', get_post_status( array_shift( $post_ids ) ) );
 	}
 
 	public function test_post_create_with_thumbnail() {
@@ -93,6 +95,7 @@ public function test_attachment_factory() {
 		$this->shim_test( \WP_Post::class, 'attachment' );
 
 		$attachment = static::factory()->attachment->create_and_get();
+
 		$this->assertEquals( 'attachment', get_post_type( $attachment ) );
 	}
 
@@ -104,7 +107,6 @@ public function test_term_factory() {
 	public function test_blog_factory() {
 		if ( ! is_multisite() ) {
 			$this->markTestSkipped( 'This test requires multisite.' );
-			return;
 		}
 
 		$this->shim_test( \WP_Site::class, 'blog' );
@@ -113,7 +115,6 @@ public function test_blog_factory() {
 	public function test_network_factory() {
 		if ( ! is_multisite() ) {
 			$this->markTestSkipped( 'This test requires multisite.' );
-			return;
 		}
 
 		$this->shim_test( \WP_Network::class, 'network' );
@@ -148,7 +149,7 @@ public function test_comment_factory() {
 
 	public function test_as_models() {
 		$post = static::factory()->post->as_models()->create_and_get();
-		$term = static::factory()->term->as_models()->with_model( Testable_Post_Tag::class )->create_and_get();
+		$term = static::factory()->term->with_model( Testable_Post_Tag::class )->as_models()->create_and_get();
 
 		$this->assertInstanceOf( Post::class, $post );
 		$this->assertInstanceOf( Testable_Post_Tag::class, $term );
@@ -271,6 +272,23 @@ protected function shim_test( string $class_name, string $property ) {
 
 		$this->assertCount( 10, $object_ids );
 	}
+
+	/**
+	 * @dataProvider dataprovider_factory
+	 */
+	public function test_dataprovider_factory( $post ) {
+		$this->assertInstanceOf( \WP_Post::class, $post );
+		$this->assertStringContainsString(
+			'<!-- wp:paragraph',
+			$post->post_content,
+		);
+	}
+
+	public static function dataprovider_factory(): array {
+		return [
+			'example' => [ static::factory()->post->create_and_get() ],
+		];
+	}
 }
 
 class Testable_Post_Tag extends Term {

From c69255637b07c326d060bc4191dcae8d9ec561c6 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 14 Nov 2023 10:48:26 -0500
Subject: [PATCH 23/32] Adding block assertions to strings (#463)

* Overhauling the generics of factories to return the proper type

* Adding a global constant to make testing easier

* Include some functionality from core

* Ensure that post factories work in data providers

* Switch to get_comment_delimited_block_content() to compile blocks

* Ensure that a new line is added before/after content

* Adding block assertions for string/content

* Adjust message

* Adjusting to support 1.0-3.0

* Fixing PHPCS
---
 composer.json                                 |   1 +
 src/mantle/faker/class-faker-provider.php     |  26 +++
 .../testing/concerns/trait-assertions.php     |   3 +-
 .../concerns/trait-block-assertions.php       | 156 ++++++++++++++++++
 .../testing/concerns/trait-with-faker.php     |   7 +-
 .../concerns/test-block-assertions.php        |  43 +++++
 6 files changed, 234 insertions(+), 2 deletions(-)
 create mode 100644 src/mantle/testing/concerns/trait-block-assertions.php
 create mode 100644 tests/testing/concerns/test-block-assertions.php

diff --git a/composer.json b/composer.json
index efd32400..c19213ee 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,7 @@
     },
     "require-dev": {
         "alleyinteractive/alley-coding-standards": "^1.0.1",
+        "alleyinteractive/wp-match-blocks": "^1.0 || ^2.0 || ^3.0",
         "guzzlehttp/guzzle": "^7.7",
         "league/flysystem-aws-s3-v3": "^1.0",
         "mockery/mockery": "^1.6.6",
diff --git a/src/mantle/faker/class-faker-provider.php b/src/mantle/faker/class-faker-provider.php
index bf1f82d3..52b6f7ae 100644
--- a/src/mantle/faker/class-faker-provider.php
+++ b/src/mantle/faker/class-faker-provider.php
@@ -14,6 +14,32 @@
  * Faker Block Provider
  */
 class Faker_Provider extends Base {
+	/**
+	 * Compile a set of blocks.
+	 *
+	 * @param array $blocks Blocks to compile.
+	 * @return string
+	 */
+	public static function blocks( array $blocks ): string {
+		return implode( "\n\n", $blocks );
+	}
+
+	/**
+	 * Build a heading block.
+	 *
+	 * @param int $level Heading level.
+	 * @return string
+	 */
+	public static function heading_block( int $level = 2 ): string {
+		return static::block(
+			'heading',
+			sprintf( '<h%d>%s</h%d>', $level, Lorem::sentence(), $level ),
+			[
+				'level' => $level,
+			],
+		);
+	}
+
 	/**
 	 * Build a paragraph block.
 	 *
diff --git a/src/mantle/testing/concerns/trait-assertions.php b/src/mantle/testing/concerns/trait-assertions.php
index 0c6bc7ef..3c4bec91 100644
--- a/src/mantle/testing/concerns/trait-assertions.php
+++ b/src/mantle/testing/concerns/trait-assertions.php
@@ -23,7 +23,8 @@
  * Assorted Test_Cast assertions.
  */
 trait Assertions {
-	use Asset_Assertions;
+	use Asset_Assertions,
+		Block_Assertions;
 
 	/**
 	 * Asserts that the given value is an instance of WP_Error.
diff --git a/src/mantle/testing/concerns/trait-block-assertions.php b/src/mantle/testing/concerns/trait-block-assertions.php
new file mode 100644
index 00000000..62644f92
--- /dev/null
+++ b/src/mantle/testing/concerns/trait-block-assertions.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Block_Assertions trait file
+ *
+ * phpcs:disable WordPress.PHP.DevelopmentFunctions.error_log_print_r, WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Testing\Concerns;
+
+use Mantle\Database\Model\Post;
+use WP_Post;
+
+use function Alley\WP\match_blocks;
+use function Mantle\Support\Helpers\collect;
+
+/**
+ * Assorted Block assertions
+ *
+ * @mixin \PHPUnit\Framework\TestCase
+ */
+trait Block_Assertions {
+	/**
+	 * Assert that a string can match a block.
+	 *
+	 * The arguments are passed directly to `match_block()`.
+	 *
+	 * @see \Alley\WP\match_block()
+	 *
+	 * @param string $string The string to check.
+	 * @param array  $args The arguments to pass to `match_block()`.
+	 */
+	public function assertStringMatchesBlock( string $string, array $args ): void {
+		$this->assertNotEmpty(
+			match_blocks( $string, $args ),
+			'Failed asserting that string matches block with arguments ' . print_r( $args, true ),
+		);
+	}
+
+	/**
+	 * Assert that a string does not match a block.
+	 *
+	 * The arguments are passed directly to `match_block()`.
+	 *
+	 * @see \Alley\WP\match_block()
+	 *
+	 * @param string $string The string to check.
+	 * @param array  $args The arguments to pass to `match_block()`.
+	 */
+	public function assertStringNotMatchesBlock( string $string, array $args ): void {
+		$this->assertEmpty(
+			match_blocks( $string, $args ),
+			'Failed asserting that string does not match block with arguments ' . print_r( $args, true ),
+		);
+	}
+
+	/**
+	 * Assert that a string has a block.
+	 *
+	 * @param string          $string The string to check.
+	 * @param string|string[] $block_name The block name(s) to check for. Will attempt to match any of the names.
+	 * @param array           $attrs Optional. Attributes to check for.
+	 */
+	public function assertStringHasBlock( string $string, string|array $block_name, array $attrs = [] ): void {
+		$this->assertNotEmpty(
+			match_blocks(
+				$string,
+				[
+					'attrs' => $this->convert_arguments_for_matching( $attrs ),
+					'name'  => $block_name,
+				],
+			),
+			! empty( $attrs )
+				? "Failed asserting that string has block [{$block_name}] with attributes " . print_r( $attrs, true )
+				: "Failed asserting that string has block [{$block_name}]."
+		);
+	}
+
+	/**
+	 * Assert that a string does not have a block.
+	 *
+	 * @param string          $string The string to check.
+	 * @param string|string[] $block_name The block name(s) to check for. Will attempt to match any of the names.
+	 * @param array           $attrs Optional. Attributes to check for.
+	 */
+	public function assertStringNotHasBlock( string $string, string|array $block_name, array $attrs = [] ): void {
+		$this->assertEmpty(
+			match_blocks(
+				$string,
+				[
+					'attrs' => $this->convert_arguments_for_matching( $attrs ),
+					'name'  => $block_name,
+				],
+			),
+			! empty( $attrs )
+				? "Failed asserting that string does not have block [{$block_name}] with attributes " . print_r( $attrs, true )
+				: "Failed asserting that string does not have block [{$block_name}]",
+		);
+	}
+
+	/**
+	 * Assert that a post has a block in its content.
+	 *
+	 * @param Post|WP_Post    $post The post to check.
+	 * @param string|string[] $block_name The block name(s) to check for. Will attempt to match any of the names.
+	 * @param array           $attrs Optional. Attributes to check for.
+	 */
+	public function assertPostHasBlock( Post|WP_Post $post, string|array $block_name, array $attrs = [] ): void {
+		$this->assertStringHasBlock( $post->post_content, $block_name, $attrs );
+	}
+
+	/**
+	 * Assert that a post does not have a block in its content.
+	 *
+	 * @param Post|WP_Post    $post The post to check.
+	 * @param string|string[] $block_name The block name(s) to check for. Will attempt to match any of the names.
+	 * @param array           $attrs Optional. Attributes to check for.
+	 */
+	public function assertPostNotHasBlock( Post|WP_Post $post, string|array $block_name, array $attrs = [] ): void {
+		$this->assertStringNotHasBlock( $post->post_content, $block_name, $attrs );
+	}
+
+	/**
+	 * Convert the key/value arguments to an array that can be passed to
+	 * `match_block()`.
+	 *
+	 * @param array $args The arguments to convert.
+	 * @return array
+	 */
+	protected function convert_arguments_for_matching( array $args ): array {
+		// PHPCS is crashing on these lines for some reason. Disabling it for now
+		// until we've upgrading to WPCS 3.0.
+
+		/* phpcs:disable */
+		return collect( $args )->reduce(
+			function ( array $carry, $value, $key ) {
+				// Allow for passing an argument pair directly.
+				if ( is_array( $value ) && isset( $value['key'], $value['value'] )  ) {
+					$carry[] = $value;
+
+					return $carry;
+				}
+
+				$carry[] = [
+					$key    => $value,
+					'value' => $value,
+				];
+
+				return $carry;
+			},
+			[]
+		);
+		/* phpcs:enable */
+	}
+}
diff --git a/src/mantle/testing/concerns/trait-with-faker.php b/src/mantle/testing/concerns/trait-with-faker.php
index b90f7d78..33ad6e73 100644
--- a/src/mantle/testing/concerns/trait-with-faker.php
+++ b/src/mantle/testing/concerns/trait-with-faker.php
@@ -9,6 +9,7 @@
 
 use Faker\Generator;
 use Faker\Factory;
+use Mantle\Faker\Faker_Provider;
 
 /**
  * This trait sets up a faker instance for use in tests.
@@ -44,6 +45,10 @@ protected function make_faker(): Generator {
 			return $this->app->make( Generator::class, [ 'locale' => $locale ] );
 		}
 
-		return Factory::create( $locale );
+		$generator = Factory::create( $locale );
+
+		$generator->addProvider( new Faker_Provider( $generator ) );
+
+		return $generator;
 	}
 }
diff --git a/tests/testing/concerns/test-block-assertions.php b/tests/testing/concerns/test-block-assertions.php
new file mode 100644
index 00000000..97a8805a
--- /dev/null
+++ b/tests/testing/concerns/test-block-assertions.php
@@ -0,0 +1,43 @@
+<?php
+namespace Mantle\Tests\Testing\Concerns;
+
+use Mantle\Testing\Concerns\With_Faker;
+use Mantle\Testing\Framework_Test_Case;
+use WP_Post;
+
+/**
+ * @group testing
+ */
+class Test_Block_Assertions extends Framework_Test_Case {
+	use With_Faker;
+
+	protected WP_Post $post;
+
+	public function setUp(): void {
+		parent::setUp();
+
+		$this->post = static::factory()->post->create_and_get( [
+			'post_content' => $this->faker->blocks( [
+				$this->faker->paragraph_block,
+				$this->faker->heading_block( 3 ),
+				$this->faker->paragraph_block,
+				$this->faker->heading_block( 4 ),
+				$this->faker->paragraph_block,
+			] ),
+		] );
+	}
+
+	public function test_string_has_content() {
+		$this->assertStringHasBlock( $this->post->post_content, 'core/paragraph' );
+		$this->assertStringHasBlock( $this->post->post_content, 'core/heading' );
+		$this->assertStringHasBlock( $this->post->post_content, 'core/heading', [ 'level' => 3 ] );
+		$this->assertStringNotHasBlock( $this->post->post_content, 'core/heading', [ 'level' => 5 ] );
+	}
+
+	public function test_post_has_content() {
+		$this->assertPostHasBlock( $this->post, 'core/paragraph' );
+		$this->assertPostHasBlock( $this->post, 'core/heading' );
+		$this->assertPostHasBlock( $this->post, 'core/heading', [ 'level' => 3 ] );
+		$this->assertPostNotHasBlock( $this->post, 'core/heading', [ 'level' => 5 ] );
+	}
+}

From 80d3aec001d1d9f3f7d75ccb6ad595685901ac5a Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 14 Nov 2023 11:15:48 -0500
Subject: [PATCH 24/32] Add a shutdown handler to the installation script to
 prevent silent fatals (#464)

* Adding a shutdown function handler to catch errors and display them

* Only load the shutdown handler during installation

* Docs
---
 src/mantle/testing/class-utils.php            | 24 +++++++++++++++++++
 .../concerns/trait-rsync-installation.php     |  4 ++++
 src/mantle/testing/wordpress-bootstrap.php    |  5 ++++
 3 files changed, 33 insertions(+)

diff --git a/src/mantle/testing/class-utils.php b/src/mantle/testing/class-utils.php
index 8e82d5e6..9d1a9977 100644
--- a/src/mantle/testing/class-utils.php
+++ b/src/mantle/testing/class-utils.php
@@ -472,8 +472,32 @@ public static function ensure_composer_loaded() {
 		foreach ( $paths as $path ) {
 			if ( ! is_dir( $path ) && file_exists( $path ) ) {
 				require_once $path;
+
 				return;
 			}
 		}
 	}
+
+	/**
+	 * Register a shutdown function to handle errors.
+	 *
+	 * Used during the WordPress installation process to catch silent errors.
+	 */
+	public static function register_shutdown_function(): void {
+		register_shutdown_function( [ static::class, 'handle_shutdown' ] );
+	}
+
+	/**
+	 * Handle a shutdown error and display it.
+	 */
+	public static function handle_shutdown(): void {
+		$error = error_get_last();
+
+		if ( ! $error ) {
+			return;
+		}
+
+		static::error( '🚨 Error during test run:', 'Shutdown' );
+		static::code( $error );
+	}
 }
diff --git a/src/mantle/testing/concerns/trait-rsync-installation.php b/src/mantle/testing/concerns/trait-rsync-installation.php
index 7f3c2bea..dc1b2a9e 100644
--- a/src/mantle/testing/concerns/trait-rsync-installation.php
+++ b/src/mantle/testing/concerns/trait-rsync-installation.php
@@ -141,6 +141,10 @@ public function maybe_rsync( string $to = null, string $from = null ): static {
 	 * rsync the codebase from the wp-content level to the root of the WordPress
 	 * installation. Also will attempt to locate the wp-content directory relative
 	 * to the current directory.
+	 *
+	 * This isn't a perfect function and can sometimes fail to locate the proper
+	 * `wp-content` directory. If it does fail to work, manually call
+	 * `maybe_rsync()` yourself with the proper paths.
 	 */
 	public function maybe_rsync_wp_content(): static {
 		// Attempt to locate wp-content relative to the current directory.
diff --git a/src/mantle/testing/wordpress-bootstrap.php b/src/mantle/testing/wordpress-bootstrap.php
index 34932796..2d3b751d 100644
--- a/src/mantle/testing/wordpress-bootstrap.php
+++ b/src/mantle/testing/wordpress-bootstrap.php
@@ -158,6 +158,11 @@
 	}
 }
 
+// Ensure that the shutdown function is registered when installing WordPress.
+if ( $installing_wp ) {
+	Utils::register_shutdown_function();
+}
+
 if ( $multisite && ! $installing_wp ) {
 	Utils::info( 'Running as multisite...' );
 	defined( 'MULTISITE' ) or define( 'MULTISITE', true );

From ec745aae779c173f83bfeea5bbf0d7e497c23a64 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 14 Nov 2023 11:17:23 -0500
Subject: [PATCH 25/32] Allow partial matching of HTML content by xpath
 selectors (#466)

* Allow partial matching of HTML content by xpath selectors

* Roll our own html driver to prevent errors

* Fixing snapshots testing for html
---
 .../concerns/trait-snapshot-testing.php       | 58 ++++++++++++++++---
 .../testing/snapshots/class-html-driver.php   | 52 +++++++++++++++++
 ...Requests__test_match_snapshot_http__1.html |  2 +-
 ..._Requests__test_match_snapshot_http__1.txt |  1 -
 ...__test_match_snapshot_http_partial__1.html |  6 ++
 .../concerns/test-makes-http-requests.php     | 43 ++++++++++++++
 6 files changed, 153 insertions(+), 9 deletions(-)
 create mode 100644 src/mantle/testing/snapshots/class-html-driver.php
 delete mode 100644 tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.txt
 create mode 100644 tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html

diff --git a/src/mantle/testing/concerns/trait-snapshot-testing.php b/src/mantle/testing/concerns/trait-snapshot-testing.php
index e0da6083..3104bb33 100644
--- a/src/mantle/testing/concerns/trait-snapshot-testing.php
+++ b/src/mantle/testing/concerns/trait-snapshot-testing.php
@@ -3,14 +3,17 @@
  * Snapshot_Testing trait file
  *
  * phpcs:disable WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
+ * phpcs:disable WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
  *
  * @package Mantle
  */
 
 namespace Mantle\Testing\Concerns;
 
+use DOMDocument;
 use Mantle\Support\Arr;
 use Mantle\Support\Str;
+use Mantle\Testing\Snapshots\HTML_Driver;
 
 use function Mantle\Support\Helpers\collect;
 use function Mantle\Support\Helpers\data_get;
@@ -28,10 +31,11 @@ trait Snapshot_Testing {
 	 *
 	 * Alias to `assertMatchesSnapshotContent()`.
 	 *
+	 * @param mixed ...$args Optional. Additional arguments to pass to the snapshot assertion.
 	 * @return static
 	 */
-	public function assertMatchesSnapshot(): static {
-		return $this->assertMatchesSnapshotContent();
+	public function assertMatchesSnapshot( ...$args ): static {
+		return $this->assertMatchesSnapshotContent( ...$args );
 	}
 
 	/**
@@ -40,14 +44,17 @@ public function assertMatchesSnapshot(): static {
 	 * Checks the response content-type to use the proper driver to make the
 	 * assertion against.
 	 *
+	 * @param mixed ...$args Optional. Additional arguments to pass to the snapshot assertion.
 	 * @return static
 	 */
-	public function assertMatchesSnapshotContent(): static {
+	public function assertMatchesSnapshotContent( ...$args ): static {
 		if ( $this->test_case ) {
 			$content_type = $this->get_header( 'content-type' );
 
 			if ( Str::contains( $content_type, 'application/json', true ) ) {
-				return $this->assertMatchesSnapshotJson();
+				return $this->assertMatchesSnapshotJson( ...$args );
+			} elseif ( Str::contains( $content_type, 'text/html', true ) ) {
+				return $this->assertMatchesSnapshotHtml( ...$args );
 			} else {
 				$this->test_case->assertMatchesSnapshot( $this->get_content() );
 			}
@@ -59,13 +66,50 @@ public function assertMatchesSnapshotContent(): static {
 	/**
 	 * Assert that the response's HTML content matches a stored snapshot.
 	 *
+	 * @param array<string>|string|null $selectors Optional. The XPath selectors to include in the snapshot, or null to include the entire content. Defaults to the entire content.
 	 * @return static
 	 */
-	public function assertMatchesSnapshotHtml(): static {
-		if ( $this->test_case ) {
-			$this->test_case->assertMatchesHtmlSnapshot( $this->get_content() );
+	public function assertMatchesSnapshotHtml( array|string $selectors = null ): static {
+		if ( ! $this->test_case ) {
+			return $this;
 		}
 
+		if ( empty( $selectors ) ) {
+			$this->test_case->assertMatchesSnapshot( $this->get_content(), new HTML_Driver() );
+
+			return $this;
+		}
+
+		if ( ! is_array( $selectors ) ) {
+			$selectors = [ $selectors ];
+		}
+
+		// Extract from the content by the XPath selectors.
+		libxml_use_internal_errors( true );
+
+		$document = new DOMDocument( '1.0' );
+
+		// Mirror the internal HtmlDriver of the snapshot assertions package.
+		$document->preserveWhiteSpace = false;
+		$document->formatOutput       = true;
+
+		// To ignore HTML5 errors.
+		@$document->loadHTML( $this->get_content(), LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+
+		$nodes = ( new \DOMXPath( $document ) )->query( implode( '|', $selectors ) );
+
+		if ( 0 === count( $nodes ) ) {
+			$this->test_case->fail( 'No nodes found for the given XPath selector(s): ' . print_r( $selectors, true ) ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r
+		}
+
+		$results = [];
+
+		foreach ( $nodes as $node ) {
+			$results[] = $document->saveHTML( $node );
+		}
+
+		$this->test_case->assertMatchesSnapshot( implode( "\n", $results ), new HTML_Driver() );
+
 		return $this;
 	}
 
diff --git a/src/mantle/testing/snapshots/class-html-driver.php b/src/mantle/testing/snapshots/class-html-driver.php
new file mode 100644
index 00000000..72dc8378
--- /dev/null
+++ b/src/mantle/testing/snapshots/class-html-driver.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * HTML_Driver class file
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Testing\Snapshots;
+
+use DOMDocument;
+use Spatie\Snapshots\Drivers\HtmlDriver;
+use Spatie\Snapshots\Exceptions\CantBeSerialized;
+
+/**
+ * HTML Driver for Snapshot Testing
+ *
+ * Extends the base HtmlDriver with additional flags to ignore HTML errors.
+ */
+class HTML_Driver extends HtmlDriver {
+	/**
+	 * Serialize data to html
+	 *
+	 * @param mixed $data Data to serialize.
+	 * @return string
+	 * @throws CantBeSerialized If data cannot be serialized.
+	 */
+	public function serialize( mixed $data ): string {
+		if ( ! is_string( $data ) ) {
+			throw new CantBeSerialized( 'Only strings can be serialized to html' );
+		}
+
+		if ( '' === $data ) {
+			return "\n";
+		}
+
+		$document = new DOMDocument( '1.0' );
+
+		$document->preserveWhiteSpace = false; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+		$document->formatOutput       = true; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+
+		@$document->loadHTML( $data, LIBXML_HTML_NODEFDTD | LIBXML_HTML_NOIMPLIED ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+
+		$value = $document->saveHTML();
+
+		// Normalize line endings for cross-platform tests.
+		if ( PHP_OS_FAMILY === 'Windows' ) {
+			$value = implode( "\n", explode( "\r\n", $value ) );
+		}
+
+		return $value;
+	}
+}
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html
index ddc784fd..1b9e0726 100644
--- a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html
+++ b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html
@@ -1 +1 @@
-<html><body><p>example</p></body></html>
+<p>example</p>
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.txt b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.txt
deleted file mode 100644
index 96236f81..00000000
--- a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.txt
+++ /dev/null
@@ -1 +0,0 @@
-example
\ No newline at end of file
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html
new file mode 100644
index 00000000..653788ff
--- /dev/null
+++ b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html
@@ -0,0 +1,6 @@
+<div class="example">
+			<p>Example</p>
+		<div class="example-two">
+			<p>Example two</p>
+		</div>
+</div>
diff --git a/tests/testing/concerns/test-makes-http-requests.php b/tests/testing/concerns/test-makes-http-requests.php
index c7b8bb9c..1afd1fc4 100644
--- a/tests/testing/concerns/test-makes-http-requests.php
+++ b/tests/testing/concerns/test-makes-http-requests.php
@@ -9,6 +9,7 @@
 use Mantle\Testing\Concerns\Refresh_Database;
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Test_Response;
+use PHPUnit\Framework\AssertionFailedError;
 use WP_REST_Response;
 
 use function Mantle\Support\Helpers\collect;
@@ -240,6 +241,48 @@ public function test_match_snapshot_http() {
 		$this->get( '/example' )->assertMatchesSnapshotContent();
 	}
 
+	public function test_match_snapshot_http_partial() {
+		$random = wp_rand();
+
+		Route::get( '/example/', fn () => <<<HTML
+			<!DOCTYPE html>
+			<html lang="en">
+				<head>
+					<meta charset="UTF-8">
+					<title>Example</title>
+				</head>
+				<body>
+					<div class="selector-ignored">
+						<p>Another selector ignored</p>
+						{$random}
+					</div>
+					<div class="example">
+						<p>Example</p>
+					</div>
+					<div class="example-two">
+						<p>Example two</p>
+					</div>
+				</body>
+			</html>
+			HTML
+		);
+
+		$this->get( '/example' )->assertMatchesSnapshotHtml( [
+			'/html/body/div[@class="example"]',
+			'/html/body/div[@class="example-two"]',
+		] );
+	}
+
+	public function test_match_snapshot_no_selectors_matched() {
+		$this->expectException( AssertionFailedError::class );
+
+		Route::get( '/example/', fn () => 'example' );
+
+		$this->get( '/example' )->assertMatchesSnapshotHtml( [
+			'/html/body/div[@class="example"]',
+		] );
+	}
+
 	public function test_match_snapshot_rest() {
 		$this->ignoreIncorrectUsage();
 

From 3992067e2313ec62ae1e5654585c2d970bb920d6 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 14 Nov 2023 11:26:23 -0500
Subject: [PATCH 26/32] CHANGELOG for 0.12.8

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9169f04..a7bd8b72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.12.8 - 2023-11-14
+
+### Added
+
+- Adding block assertions to strings.
+- Allow partial matching of HTML content by xpath selectors.
+- Add a shutdown handler to the installation script to prevent silent fatals.
+
+### Fixed
+
+- Ensure factories can be used with data providers.
+
 ## v0.12.7 - 2023-10-02
 
 ### Added

From cc5acbe6a0f24f410c169dd1e3f286c9c6dbda22 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Mon, 20 Nov 2023 13:54:24 -0500
Subject: [PATCH 27/32] Fixing the generic for factories

---
 .../framework/console/generators/stubs/factory-post.stub      | 4 ++--
 .../framework/console/generators/stubs/factory-term.stub      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mantle/framework/console/generators/stubs/factory-post.stub b/src/mantle/framework/console/generators/stubs/factory-post.stub
index a36a9ac6..62f0e851 100644
--- a/src/mantle/framework/console/generators/stubs/factory-post.stub
+++ b/src/mantle/framework/console/generators/stubs/factory-post.stub
@@ -15,13 +15,13 @@ use App\Models\{{ class }};
 /**
  * {{ class }} Factory
  *
- * @extends \Mantle\Database\Factory\Post_Factory<\App\Models\{{ class }}>
+ * @extends \Mantle\Database\Factory\Post_Factory<\App\Models\{{ class }}, \WP_Post, {{ class }}>
  */
 class {{ class }}_Factory extends \Mantle\Database\Factory\Post_Factory {
 	/**
 	 * Model to use when creating objects.
 	 *
-	 * @var class-string<\Mantle\Database\Model\Model>
+	 * @var class-string<{{ class }}>
 	 */
 	protected string $model = {{ class }}::class;
 
diff --git a/src/mantle/framework/console/generators/stubs/factory-term.stub b/src/mantle/framework/console/generators/stubs/factory-term.stub
index 03fe50e7..9e08af1e 100644
--- a/src/mantle/framework/console/generators/stubs/factory-term.stub
+++ b/src/mantle/framework/console/generators/stubs/factory-term.stub
@@ -15,7 +15,7 @@ use App\Models\{{ class }};
 /**
  * {{ class }} Factory
  *
- * @extends \Mantle\Database\Factory\Term_Factory<\App\Models\{{ class }}>
+ * @extends \Mantle\Database\Factory\Term_Factory<\App\Models\{{ class }}, \WP_Term, {{ class }}>
  */
 class {{ class }}_Factory extends \Mantle\Database\Factory\Term_Factory {
 	/**

From 9ba62e1b21546d75dc8a03556046ad193f1ad1c7 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 21 Nov 2023 09:13:02 -0500
Subject: [PATCH 28/32] Support PHPUnit 10 (#427)

* Including support for PHPUnit 10

* Upping to nunomaduro/collision

* Migrating phpunit config

* Upgrading annotation reader for PHPUnit 10.x

* Adding PSR-4 autoloader dev

* WIP on conversion script

* Work to support the PSR4 migration

* Script to convert to PSR4

* Extend to collision 6 for older versions

* Bump asset manager

* Change to support PHPUnit 10 (#473)
---
 .gitignore                                    |   3 +-
 bin/convert-psr4-dir.php                      |  49 +++++
 bin/convert-psr4-file.php                     | 132 ++++++++++++++
 composer.json                                 |  19 +-
 monorepo-builder.php                          |   2 +-
 phpunit.xml                                   |  23 ++-
 src/mantle/assets/composer.json               |   2 +-
 src/mantle/support/class-stringable.php       |   9 +
 src/mantle/testing/class-assert.php           |  54 ------
 .../testing/concerns/trait-deprecations.php   |  12 +-
 .../concerns/trait-incorrect-usage.php        |  13 +-
 .../concerns/trait-reads-annotations.php      |  57 ++++++
 src/mantle/testkit/composer.json              |   6 +-
 .../AssetLoaderTest.php}                      |   4 +-
 .../AssetManagerTest.php}                     |  15 +-
 .../TestCase.php}                             |   3 +-
 .../CacheManagerTest.php}                     |   2 +-
 .../RepositoryTest.php}                       |   2 +-
 .../CommandTest.php}                          |   2 +-
 .../GeneratorCommandTest.php}                 |   2 +-
 .../HookUsageCommandTest.php.bak}             |   2 +-
 .../ParserTest.php}                           |   2 +-
 .../generators/PrinterTest.php}               |   2 +-
 .../hook-usage/base-example.php               |   0
 .../hook-usage/sub/sub-example.php            |   0
 tests/{console => Console}/test.stub          |   0
 .../ContainerCallTest.php}                    |   4 +-
 .../ContainerTest.php}                        |   4 +-
 .../Factory/FactoryTest.php}                  |   2 +-
 .../Factory/UnitTestingFactoryTest.php}       |   2 +-
 .../Model/AttachmentTest.php}                 |   2 +-
 .../Model/CommentObjectTest.php}              |   2 +-
 .../Model/ModelScopeTest.php}                 |   2 +-
 .../Model/ModelTest.php}                      |   2 +-
 .../Model/PermalinkGeneratorTest.php}         |   2 +-
 .../Model/PostModelEventsTest.php}            |   2 +-
 .../Model/PostObjectTest.php}                 |   2 +-
 .../Model/RestFieldTest.php}                  |   2 +-
 .../Model/SiteObjectTest.php}                 |   2 +-
 .../Model/TermModelEventsTest.php}            |   2 +-
 .../Model/TermObjectTest.php}                 |   2 +-
 .../Model/UserObjectTest.php}                 |   2 +-
 .../Model/registration/RegisterMetaTest.php}  |   2 +-
 .../registration/RegisterPostTypeTest.php}    |   2 +-
 .../registration/RegisterTaxonomyTest.php}    |   2 +-
 .../relations/BelongsToOneOrManyTest.php}     |   2 +-
 .../Model/relations/HasOneOrManyTest.php}     |   2 +-
 .../Query/EagerLoadRelationshipsTest.php}     |   2 +-
 .../Query/PaginatorTest.php}                  |   2 +-
 .../Query/PostQueryBuilderTest.php}           |   2 +-
 .../Query/PostQueryRelationshipsTest.php}     |   2 +-
 .../Query/TermQueryBuilderTest.php}           |   2 +-
 .../EventDispatcherTest.php}                  |   2 +-
 .../WordPressActionDispatcherTest.php}        |   2 +-
 tests/{test-faker.php => FakerTest.php}       |   2 +-
 .../FilesystemAdapterTest.php}                |   6 +-
 .../FilesystemManagerTest.php}                |   2 +-
 .../FilesystemTest.php}                       | 168 +++++++++---------
 .../AliasLoaderTest.php}                      |   2 +-
 .../ApplicationTest.php}                      |   2 +-
 .../BootloaderTest.php}                       |   2 +-
 .../Events/DiscoverEventsTest.php}            |   6 +-
 .../fixtures/events/class-event-one.php       |   0
 .../fixtures/events/class-event-two.php       |   0
 .../listeners/class-example-listener.php      |   0
 .../NullableCommentObjectsTestCaseTest.php}   |   2 +-
 .../NullablePostObjectsTestCaseTest.php}      |   2 +-
 .../NullableSiteObjectsTestCaseTest.php       |  46 +++++
 .../NullableTermObjectsTestCaseTest.php}      |   2 +-
 .../NullableUserObjectsTestCaseTest.php}      |   2 +-
 .../IsolatedFrameworkTest.php}                |   2 +-
 .../PipelineTest.php}                         |   0
 .../HelpersArrayTest.php}                     |   2 +-
 .../HelpersGeneralTest.php}                   |   4 +-
 .../HelpersTest.php}                          |   2 +-
 .../ControllerTest.php}                       |   2 +-
 .../RedirectorTest.php}                       |   2 +-
 .../ResponseFactoryTest.php}                  |   2 +-
 .../test-router.php => Http/RouterTest.php}   |   2 +-
 .../Routing/PostModelRoutingTest.php}         |   2 +-
 .../Routing/RestApiRoutingTest.php}           |   2 +-
 .../Routing/TermModelRoutingTest.php}         |   2 +-
 .../UploadedFileTest.php}                     |   2 +-
 .../UrlGeneratorTest.php}                     |   2 +-
 .../HttpClientTest.php}                       |   2 +-
 .../LogManagerTest.php}                       |   2 +-
 .../DispatcherTest.php}                       |   2 +-
 .../QueueManagerTest.php}                     |   2 +-
 .../test-worker.php => Queue/WorkerTest.php}  |   2 +-
 .../providers/WordPressCronQueueTest.php}     |   2 +-
 .../EventTest.php}                            |   2 +-
 .../FrequencyTest.php}                        |   2 +-
 .../test-arr.php => Support/ArrTest.php}      |   2 +-
 .../CollectionTest.php}                       |   8 +-
 .../EnvironmentTest.php}                      |   2 +-
 .../ForwardCallsTest.php}                     |   2 +-
 .../PluralizerTest.php}                       |   2 +-
 .../Providers/ModelRegisterProviderTest.php}  |   2 +-
 .../ServiceProviderTest.php}                  |   2 +-
 .../test-str.php => Support/StrTest.php}      |   2 +-
 .../StringableTest.php}                       |   2 +-
 .../Concerns/BlockAssertionsTest.php}         |   2 +-
 .../Concerns/DeprecationsTest.php}            |   2 +-
 .../Concerns/ElementAssertionsTest.php}       |   2 +-
 .../Concerns/IncorrectUsageTest.php}          |   2 +-
 .../Concerns/InteractsWithConsoleTest.php}    |   4 +-
 .../InteractsWithExternalRequestsTest.php}    |   2 +-
 .../Concerns/InteractsWithHooksTest.php}      |   2 +-
 .../Concerns/MakesHttpRequestsTest.php}       |   2 +-
 .../Concerns/WordPressAuthenticationTest.php} |   4 +-
 ...pRequestsTest__test_match_snapshot__1.yml} |   0
 ...stsTest__test_match_snapshot_http__1.html} |   0
 ..._test_match_snapshot_http_partial__1.html} |   0
 ...stsTest__test_match_snapshot_rest__1.json} |   0
 ...stsTest__test_match_snapshot_rest__2.json} |   0
 ...stsTest__test_match_snapshot_rest__3.json} |   0
 ...questsTest__test_multiple_requests__1.yml} |   0
 .../CoreTestShimTest.php}                     |   2 +-
 .../PermalinkStructureTest.php}               |   2 +-
 .../WithFakerTest.php}                        |   5 +-
 .../Concerns/ExampleOverload.php}             |   4 +-
 .../TestkitInstallWordPressTest.php}          |   2 +-
 .../TestkitTestCaseTest.php}                  |   6 +-
 .../WithFakerTest.php}                        |   2 +-
 .../fixtures/global-functions.php             |   0
 .../BladeViewsTest.php}                       |   2 +-
 .../FileEngineTest.php}                       |   2 +-
 .../PhpViewsTest.php}                         |   2 +-
 .../ViewFinderTest.php}                       |   2 +-
 .../fixtures/blocks/class-mock-block.php      |  21 ---
 .../fixtures/dummy/class-example-block.php    |  16 --
 .../framework/blocks/test-block-provider.php  |  76 --------
 .../test-nullable-site-objects-test-case.php  |  40 -----
 133 files changed, 537 insertions(+), 458 deletions(-)
 create mode 100644 bin/convert-psr4-dir.php
 create mode 100644 bin/convert-psr4-file.php
 delete mode 100644 src/mantle/testing/class-assert.php
 create mode 100644 src/mantle/testing/concerns/trait-reads-annotations.php
 rename tests/{assets/test-asset-loader.php => Assets/AssetLoaderTest.php} (93%)
 rename tests/{assets/test-asset-manager.php => Assets/AssetManagerTest.php} (75%)
 rename tests/{assets/class-test-case.php => Assets/TestCase.php} (95%)
 rename tests/{cache/test-cache-manager.php => Cache/CacheManagerTest.php} (97%)
 rename tests/{config/test-repository.php => Config/RepositoryTest.php} (97%)
 rename tests/{console/test-command.php => Console/CommandTest.php} (98%)
 rename tests/{console/test-generator-command.php => Console/GeneratorCommandTest.php} (98%)
 rename tests/{console/test-hook-usage-command.php => Console/HookUsageCommandTest.php.bak} (96%)
 rename tests/{console/test-parser.php => Console/ParserTest.php} (99%)
 rename tests/{console/generators/test-printer.php => Console/generators/PrinterTest.php} (98%)
 rename tests/{console => Console}/hook-usage/base-example.php (100%)
 rename tests/{console => Console}/hook-usage/sub/sub-example.php (100%)
 rename tests/{console => Console}/test.stub (100%)
 rename tests/{container/test-container-call.php => Container/ContainerCallTest.php} (99%)
 rename tests/{container/test-container.php => Container/ContainerTest.php} (99%)
 rename tests/{database/factory/test-factory.php => Database/Factory/FactoryTest.php} (99%)
 rename tests/{database/factory/test-unit-testing-factory.php => Database/Factory/UnitTestingFactoryTest.php} (99%)
 rename tests/{database/model/test-attachment.php => Database/Model/AttachmentTest.php} (93%)
 rename tests/{database/model/test-comment-object.php => Database/Model/CommentObjectTest.php} (97%)
 rename tests/{database/model/test-model-scope.php => Database/Model/ModelScopeTest.php} (98%)
 rename tests/{database/model/test-model.php => Database/Model/ModelTest.php} (99%)
 rename tests/{database/model/test-permalink-generator.php => Database/Model/PermalinkGeneratorTest.php} (94%)
 rename tests/{database/model/test-post-model-events.php => Database/Model/PostModelEventsTest.php} (98%)
 rename tests/{database/model/test-post-object.php => Database/Model/PostObjectTest.php} (99%)
 rename tests/{database/model/test-rest-field.php => Database/Model/RestFieldTest.php} (93%)
 rename tests/{database/model/test-site-object.php => Database/Model/SiteObjectTest.php} (94%)
 rename tests/{database/model/test-term-model-events.php => Database/Model/TermModelEventsTest.php} (98%)
 rename tests/{database/model/test-term-object.php => Database/Model/TermObjectTest.php} (98%)
 rename tests/{database/model/test-user-object.php => Database/Model/UserObjectTest.php} (97%)
 rename tests/{database/model/registration/test-register-meta.php => Database/Model/registration/RegisterMetaTest.php} (95%)
 rename tests/{database/model/registration/test-register-post-type.php => Database/Model/registration/RegisterPostTypeTest.php} (98%)
 rename tests/{database/model/registration/test-register-taxonomy.php => Database/Model/registration/RegisterTaxonomyTest.php} (96%)
 rename tests/{database/model/relations/test-belongs-to-one-or-many.php => Database/Model/relations/BelongsToOneOrManyTest.php} (98%)
 rename tests/{database/model/relations/test-has-one-or-many.php => Database/Model/relations/HasOneOrManyTest.php} (99%)
 rename tests/{database/query/test-eager-load-relationships.php => Database/Query/EagerLoadRelationshipsTest.php} (99%)
 rename tests/{database/query/test-paginator.php => Database/Query/PaginatorTest.php} (99%)
 rename tests/{database/query/test-post-query-builder.php => Database/Query/PostQueryBuilderTest.php} (99%)
 rename tests/{database/query/test-post-query-relationships.php => Database/Query/PostQueryRelationshipsTest.php} (97%)
 rename tests/{database/query/test-term-query-builder.php => Database/Query/TermQueryBuilderTest.php} (98%)
 rename tests/{events/test-event-dispatcher.php => Events/EventDispatcherTest.php} (97%)
 rename tests/{events/test-wordpress-action-dispatcher.php => Events/WordPressActionDispatcherTest.php} (98%)
 rename tests/{test-faker.php => FakerTest.php} (96%)
 rename tests/{filesystem/test-filesystem-adapter.php => Filesystem/FilesystemAdapterTest.php} (98%)
 rename tests/{filesystem/test-filesystem-manager.php => Filesystem/FilesystemManagerTest.php} (97%)
 rename tests/{filesystem/test-filesystem.php => Filesystem/FilesystemTest.php} (67%)
 rename tests/{framework/test-alias-loader.php => Framework/AliasLoaderTest.php} (97%)
 rename tests/{framework/test-application.php => Framework/ApplicationTest.php} (98%)
 rename tests/{framework/test-bootloader.php => Framework/BootloaderTest.php} (98%)
 rename tests/{framework/events/test-discover-events.php => Framework/Events/DiscoverEventsTest.php} (88%)
 rename tests/{framework/events => Framework/Events}/fixtures/events/class-event-one.php (100%)
 rename tests/{framework/events => Framework/Events}/fixtures/events/class-event-two.php (100%)
 rename tests/{framework/events => Framework/Events}/fixtures/listeners/class-example-listener.php (100%)
 rename tests/{framework/helpers/test-nullable-comment-objects-test-case.php => Framework/Helpers/NullableCommentObjectsTestCaseTest.php} (93%)
 rename tests/{framework/helpers/test-nullable-post-objects-test-case.php => Framework/Helpers/NullablePostObjectsTestCaseTest.php} (95%)
 create mode 100644 tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php
 rename tests/{framework/helpers/test-nullable-term-objects-test-case.php => Framework/Helpers/NullableTermObjectsTestCaseTest.php} (98%)
 rename tests/{framework/helpers/test-nullable-user-objects-test-case.php => Framework/Helpers/NullableUserObjectsTestCaseTest.php} (95%)
 rename tests/{framework/test-isolated-framework.php => Framework/IsolatedFrameworkTest.php} (95%)
 rename tests/{framework/test-pipeline.php => Framework/PipelineTest.php} (100%)
 rename tests/{helpers/test-helpers-array.php => Helpers/HelpersArrayTest.php} (99%)
 rename tests/{helpers/test-helpers-general.php => Helpers/HelpersGeneralTest.php} (98%)
 rename tests/{helpers/test-helpers.php => Helpers/HelpersTest.php} (98%)
 rename tests/{http/test-controller.php => Http/ControllerTest.php} (97%)
 rename tests/{http/test-redirector.php => Http/RedirectorTest.php} (98%)
 rename tests/{http/test-response-factory.php => Http/ResponseFactoryTest.php} (93%)
 rename tests/{http/test-router.php => Http/RouterTest.php} (99%)
 rename tests/{http/routing/test-post-model-routing.php => Http/Routing/PostModelRoutingTest.php} (97%)
 rename tests/{http/routing/test-rest-api-routing.php => Http/Routing/RestApiRoutingTest.php} (98%)
 rename tests/{http/routing/test-term-model-routing.php => Http/Routing/TermModelRoutingTest.php} (98%)
 rename tests/{http/test-uploaded-file.php => Http/UploadedFileTest.php} (94%)
 rename tests/{http/test-url-generator.php => Http/UrlGeneratorTest.php} (98%)
 rename tests/{http-client/test-http-client.php => HttpClient/HttpClientTest.php} (99%)
 rename tests/{log/test-log-manager.php => Log/LogManagerTest.php} (97%)
 rename tests/{queue/test-dispatcher.php => Queue/DispatcherTest.php} (96%)
 rename tests/{queue/test-queue-manager.php => Queue/QueueManagerTest.php} (94%)
 rename tests/{queue/test-worker.php => Queue/WorkerTest.php} (98%)
 rename tests/{queue/providers/test-wordpress-cron-queue.php => Queue/providers/WordPressCronQueueTest.php} (98%)
 rename tests/{scheduling/test-event.php => Scheduling/EventTest.php} (97%)
 rename tests/{scheduling/test-frequency.php => Scheduling/FrequencyTest.php} (98%)
 rename tests/{support/test-arr.php => Support/ArrTest.php} (99%)
 rename tests/{support/test-collection.php => Support/CollectionTest.php} (99%)
 rename tests/{support/test-environment.php => Support/EnvironmentTest.php} (94%)
 rename tests/{support/test-forward-calls.php => Support/ForwardCallsTest.php} (98%)
 rename tests/{support/test-pluralizer.php => Support/PluralizerTest.php} (99%)
 rename tests/{support/providers/test-model-register-provider.php => Support/Providers/ModelRegisterProviderTest.php} (94%)
 rename tests/{support/test-service-provider.php => Support/ServiceProviderTest.php} (99%)
 rename tests/{support/test-str.php => Support/StrTest.php} (99%)
 rename tests/{support/test-stringable.php => Support/StringableTest.php} (99%)
 rename tests/{testing/concerns/test-block-assertions.php => Testing/Concerns/BlockAssertionsTest.php} (95%)
 rename tests/{testing/concerns/test-deprecations.php => Testing/Concerns/DeprecationsTest.php} (96%)
 rename tests/{testing/concerns/test-element-assertions.php => Testing/Concerns/ElementAssertionsTest.php} (96%)
 rename tests/{testing/concerns/test-incorrect-usage.php => Testing/Concerns/IncorrectUsageTest.php} (96%)
 rename tests/{testing/concerns/test-interacts-with-console.php => Testing/Concerns/InteractsWithConsoleTest.php} (93%)
 rename tests/{testing/concerns/test-interacts-with-external-requests.php => Testing/Concerns/InteractsWithExternalRequestsTest.php} (99%)
 rename tests/{testing/concerns/test-interacts-with-hooks.php => Testing/Concerns/InteractsWithHooksTest.php} (98%)
 rename tests/{testing/concerns/test-makes-http-requests.php => Testing/Concerns/MakesHttpRequestsTest.php} (99%)
 rename tests/{testing/concerns/test-wordpress-authentication.php => Testing/Concerns/WordPressAuthenticationTest.php} (90%)
 rename tests/{testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot__1.yml => Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot__1.yml} (100%)
 rename tests/{testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html => Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http__1.html} (100%)
 rename tests/{testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html => Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http_partial__1.html} (100%)
 rename tests/{testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__1.json => Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__1.json} (100%)
 rename tests/{testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__2.json => Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__2.json} (100%)
 rename tests/{testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__3.json => Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__3.json} (100%)
 rename tests/{testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_multiple_requests__1.yml => Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_multiple_requests__1.yml} (100%)
 rename tests/{testing/test-core-test-shim.php => Testing/CoreTestShimTest.php} (88%)
 rename tests/{testing/test-permalink-structure.php => Testing/PermalinkStructureTest.php} (97%)
 rename tests/{testing/test-with-faker.php => Testing/WithFakerTest.php} (62%)
 rename tests/{testkit/concerns/trait-example-overload.php => Testkit/Concerns/ExampleOverload.php} (83%)
 rename tests/{testkit/test-testkit-install-wordpress.php => Testkit/TestkitInstallWordPressTest.php} (92%)
 rename tests/{testkit/test-testkit-test-case.php => Testkit/TestkitTestCaseTest.php} (87%)
 rename tests/{testkit/test-with-faker.php => Testkit/WithFakerTest.php} (85%)
 rename tests/{testkit => Testkit}/fixtures/global-functions.php (100%)
 rename tests/{view/test-blade-views.php => View/BladeViewsTest.php} (93%)
 rename tests/{view/test-file-engine.php => View/FileEngineTest.php} (91%)
 rename tests/{view/test-php-views.php => View/PhpViewsTest.php} (99%)
 rename tests/{view/test-view-finder.php => View/ViewFinderTest.php} (96%)
 delete mode 100644 tests/framework/blocks/fixtures/blocks/class-mock-block.php
 delete mode 100644 tests/framework/blocks/fixtures/dummy/class-example-block.php
 delete mode 100644 tests/framework/blocks/test-block-provider.php
 delete mode 100644 tests/framework/helpers/test-nullable-site-objects-test-case.php

diff --git a/.gitignore b/.gitignore
index 45629dbc..60f1b891 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ vendor
 # Cache files
 .phpcs/*.json
 .phpunit.result.cache
+.phpunit.cache/
 
 # Composer files
 composer.lock
@@ -26,4 +27,4 @@ Thumbs.db
 # IDE files
 *.code-workspace
 .idea
-.vscode
\ No newline at end of file
+.vscode
diff --git a/bin/convert-psr4-dir.php b/bin/convert-psr4-dir.php
new file mode 100644
index 00000000..0dc6e535
--- /dev/null
+++ b/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 );
diff --git a/bin/convert-psr4-file.php b/bin/convert-psr4-file.php
new file mode 100644
index 00000000..24085d0a
--- /dev/null
+++ b/bin/convert-psr4-file.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Helper script to convert the tests/ package to PSR-4 coding standards.
+ *
+ * The eventual plan is to use this for the rest of the project when that can be
+ * converted over. Ideally this can be a reusable command in the future.
+ *
+ * phpcs:disable
+ */
+
+use Symfony\Component\Finder\Finder;
+
+use function Mantle\Support\Helpers\str;
+
+require_once __DIR__ . '/../vendor/autoload.php';
+
+$finder = ( new Finder() )
+	->in( realpath( __DIR__ . '/../tests' ) )
+	->name( '*.php' )
+	->notName( [ 'bootstrap.php', 'sub-example.php', 'base-example.php' ] )
+	->notPath( '#fixtures|__snapshots__|template-parts#' );
+
+$index = [];
+$pass  = true;
+
+foreach ( $finder as $file ) {
+	$filename = str( $file->getFilename() )->lower();
+
+	if ( $filename->startsWith( 'test-' ) ) {
+		$new_filename = $filename
+			->after( 'test-' )
+			->before( '.php' )
+			->studly()
+			->append( 'Test.php' )
+			->replace( 'Wordpress', 'WordPress' );
+
+		$old_class_name = $filename
+			->before( '.php' )
+			->studlyUnderscore()
+			->replace( 'Wordpress', 'WordPress' );
+
+		$new_class_name = $filename
+			->after( 'test-' )
+			->before( '.php' )
+			->studly()
+			->append( 'Test' )
+			->replace( 'Wordpress', 'WordPress' );
+	} else {
+		foreach ( [ 'trait', 'class' ] as $type ) {
+			if ( ! $filename->startsWith( "{$type}-" ) ) {
+				continue;
+			}
+
+			$new_filename = $filename
+				->after( "{$type}-" )
+				->before( '.php' )
+				->studly()
+				->append( '.php' )
+				->replace( 'Wordpress', 'WordPress' );
+
+			$old_class_name = $filename
+				->after( "{$type}-" )
+				->before( '.php' )
+				->studlyUnderscore();
+
+			$new_class_name = $filename
+				->after( "{$type}-" )
+				->before( '.php' )
+				->studly()
+				->replace( 'Wordpress', 'WordPress' );
+		}
+	}
+
+	// Check if the file contains the class.
+	$contents = str( file_get_contents( $file->getRealPath() ) );
+
+	$type = $filename->startsWith( 'trait-' ) ? 'trait' : 'class';
+
+	if ( ! $contents->contains( "{$type} {$old_class_name->value()} ", true ) ) {
+		echo $file->getRealPath() . ' does not contain the expected legacy ' . $type . ' ' . $old_class_name->value() . PHP_EOL;
+
+		$pass = false;
+
+		continue;
+	}
+
+	$index[] = [
+		$type,
+		[
+			$file->getRealPath(),
+			$old_class_name->value(),
+		],
+		[
+			$file->getPath() . '/' . $new_filename->value(),
+			$new_class_name->value(),
+		],
+	];
+}
+
+if ( ! $pass ) {
+	echo "\n\nPlease fix the above errors before continuing.\n";
+
+	exit( 1 );
+}
+
+echo 'Processing ' . count( $index ) . ' files...';
+
+foreach ( $index as $item ) {
+	[ $type, $old, $new ] = $item;
+
+	[ $old_file, $old_class ] = $old;
+	[ $new_file, $new_class ] = $new;
+
+	// Update the file with the new class name.
+	file_put_contents(
+		$old_file,
+		str( file_get_contents( $old_file ) )->replace( "{$type} {$old_class} ", "{$type} {$new_class} ", false )->value(),
+	);
+
+	// Update the file name.
+	if ( ! rename( $old_file, $new_file ) ) {
+		echo "Failed to rename {$old_file} to {$new_file}.\n";
+
+		exit( 1 );
+	}
+
+	echo "Updated {$old_file} to {$new_file} ({$old_class} to {$new_class}).\n";
+}
+
+echo "\nDONE!\n";
+
+exit( 0 );
diff --git a/composer.json b/composer.json
index c19213ee..e088cc7e 100644
--- a/composer.json
+++ b/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",
@@ -28,13 +28,13 @@
         "monolog/monolog": "^2.9.1",
         "nesbot/carbon": "^2.68.1",
         "nette/php-generator": "^3.6.9",
-        "nunomaduro/collision": "^6.4",
+        "nunomaduro/collision": "^6.0 || ^7.0",
         "nunomaduro/termwind": "^1.15.1",
         "psr/container": "^1.1.1 || ^2.0.2",
         "psr/log": "^1.0.1 || ^2.0 || ^3.0",
         "psr/simple-cache": "^3.0",
         "ramsey/uuid": "^4.7.4",
-        "spatie/phpunit-snapshot-assertions": "^4.2",
+        "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1",
         "symfony/console": "^6.0.19",
         "symfony/finder": "^6.0.19",
         "symfony/http-foundation": "^6.0.20",
@@ -55,7 +55,7 @@
         "php-stubs/wp-cli-stubs": "^2.8",
         "phpstan/phpdoc-parser": "^1.23.1",
         "phpstan/phpstan": "1.10.41",
-        "phpunit/phpunit": "^9.6.10",
+        "phpunit/phpunit": "^9.3.3 || ^10.0.7",
         "predis/predis": "^2.2.0",
         "squizlabs/php_codesniffer": "^3.7",
         "symplify/monorepo-builder": "^10.3.3",
@@ -86,6 +86,8 @@
         "mantle-framework/testkit": "self.version",
         "mantle-framework/view": "self.version"
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "files": [
             "src/mantle/framework/helpers.php",
@@ -100,6 +102,11 @@
             "src/mantle/testing/autoload.php"
         ]
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Mantle\\Tests\\": "tests/"
+        }
+    },
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
@@ -137,7 +144,5 @@
             "@phpstan",
             "@phpunit"
         ]
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }
diff --git a/monorepo-builder.php b/monorepo-builder.php
index e61ed5f8..f0ab4b80 100644
--- a/monorepo-builder.php
+++ b/monorepo-builder.php
@@ -54,7 +54,7 @@
 			],
 			ComposerJsonSection::REQUIRE_DEV => [
 				'alleyinteractive/alley-coding-standards' => '^1.0',
-				'phpunit/phpunit'                         => '^9.6.10',
+				'phpunit/phpunit'                         => '^9.3.3|^10.0.7',
 			],
 		],
 	);
diff --git a/phpunit.xml b/phpunit.xml
index ee9e6886..397400ca 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,15 +1,14 @@
+<?xml version="1.0"?>
 <phpunit
-    bootstrap="tests/bootstrap.php"
-    backupGlobals="false"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-		printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	bootstrap="tests/bootstrap.php"
+	backupGlobals="false"
+	colors="true"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
 >
-    <testsuites>
-        <testsuite name="mantle-framework">
-            <directory prefix="test-" suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
+	<testsuites>
+		<testsuite name="mantle-framework">
+			<directory suffix="Test.php">./tests/</directory>
+		</testsuite>
+	</testsuites>
 </phpunit>
diff --git a/src/mantle/assets/composer.json b/src/mantle/assets/composer.json
index 23467eb3..7ac86c95 100644
--- a/src/mantle/assets/composer.json
+++ b/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"
     },
diff --git a/src/mantle/support/class-stringable.php b/src/mantle/support/class-stringable.php
index a8b47bf5..b115b963 100644
--- a/src/mantle/support/class-stringable.php
+++ b/src/mantle/support/class-stringable.php
@@ -737,6 +737,15 @@ public function studly() {
 		return new static( Str::studly( $this->value ) );
 	}
 
+	/**
+	 * Convert a value to studly caps case using underscores.
+	 *
+	 * @return static
+	 */
+	public function studlyUnderscore() {
+		return new static( Str::studly_underscore( $this->value ) );
+	}
+
 	/**
 	 * Returns the portion of the string specified by the start and length parameters.
 	 *
diff --git a/src/mantle/testing/class-assert.php b/src/mantle/testing/class-assert.php
deleted file mode 100644
index 0d97a232..00000000
--- a/src/mantle/testing/class-assert.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * This file contains the Assert class
- *
- * @package Mantle
- */
-
-namespace Mantle\Testing;
-
-use PHPUnit\Framework\Assert as PHPUnit;
-use PHPUnit\Framework\Constraint\RegularExpression;
-
-/**
- * Internal assertions that exist in PHPUnit 8.x.
- * Once the code base is migrated to use PHPUnit 8+ we can remove this file.
- *
- * @internal This class is not meant to be used or overwritten outside the framework itself.
- */
-abstract class Assert extends PHPUnit {
-
-	/**
-	 * Asserts that a file does not exist.
-	 *
-	 * @param  string $filename
-	 * @param  string $message
-	 * @return void
-	 */
-	public static function assertFileDoesNotExist( string $filename, string $message = '' ): void {
-		static::assertFalse( is_file( $filename ), $message );
-	}
-
-	/**
-	 * Asserts that a directory does not exist.
-	 *
-	 * @param  string $directory
-	 * @param  string $message
-	 * @return void
-	 */
-	public static function assertDirectoryDoesNotExist( string $directory, string $message = '' ): void {
-		static::assertFalse( is_dir( $directory ), $message );
-	}
-
-	/**
-	 * Asserts that a string matches a given regular expression.
-	 *
-	 * @param  string $pattern
-	 * @param  string $string
-	 * @param  string $message
-	 * @return void
-	 */
-	public static function assertMatchesRegularExpression( string $pattern, string $string, string $message = '' ): void {
-		static::assertThat( $string, new RegularExpression( $pattern ), $message );
-	}
-}
diff --git a/src/mantle/testing/concerns/trait-deprecations.php b/src/mantle/testing/concerns/trait-deprecations.php
index 8fe38f43..61dd0bab 100644
--- a/src/mantle/testing/concerns/trait-deprecations.php
+++ b/src/mantle/testing/concerns/trait-deprecations.php
@@ -10,12 +10,11 @@
 namespace Mantle\Testing\Concerns;
 
 use Mantle\Support\Str;
-use PHPUnit\Util\Test;
 
 use function Mantle\Support\Helpers\collect;
 
 trait Deprecations {
-	use Output_Messages;
+	use Output_Messages, Reads_Annotations;
 
 	/**
 	 * Expected deprecation calls.
@@ -49,14 +48,7 @@ trait Deprecations {
 	 * Sets up the expectations for testing a deprecated call.
 	 */
 	public function deprecations_set_up() {
-		if ( ! method_exists( $this, 'getAnnotations' ) ) {
-			$annotations = Test::parseTestMethodAnnotations(
-				static::class,
-				$this->getName()
-			);
-		} else {
-			$annotations = $this->getAnnotations();
-		}
+		$annotations = $this->get_annotations_for_method();
 
 		foreach ( [ 'class', 'method' ] as $depth ) {
 			if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) ) {
diff --git a/src/mantle/testing/concerns/trait-incorrect-usage.php b/src/mantle/testing/concerns/trait-incorrect-usage.php
index 9f5ac3fd..1c0e1d03 100644
--- a/src/mantle/testing/concerns/trait-incorrect-usage.php
+++ b/src/mantle/testing/concerns/trait-incorrect-usage.php
@@ -10,8 +10,6 @@
 namespace Mantle\Testing\Concerns;
 
 use Mantle\Support\Str;
-use PHPUnit\TextUI\XmlConfiguration\PHPUnit;
-use PHPUnit\Util\Test;
 
 use function Mantle\Support\Helpers\collect;
 
@@ -22,7 +20,7 @@
  * as expected or ignored.
  */
 trait Incorrect_Usage {
-	use Output_Messages;
+	use Output_Messages, Reads_Annotations;
 
 	/**
 	 * Expected "doing it wrong" calls.
@@ -56,14 +54,7 @@ trait Incorrect_Usage {
 	 * Sets up the expectations for testing a deprecated call.
 	 */
 	public function incorrect_usage_set_up() {
-		if ( ! method_exists( $this, 'getAnnotations' ) ) {
-			$annotations = Test::parseTestMethodAnnotations(
-				static::class,
-				$this->getName()
-			);
-		} else {
-			$annotations = $this->getAnnotations();
-		}
+		$annotations = $this->get_annotations_for_method();
 
 		foreach ( [ 'class', 'method' ] as $depth ) {
 			if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) ) {
diff --git a/src/mantle/testing/concerns/trait-reads-annotations.php b/src/mantle/testing/concerns/trait-reads-annotations.php
new file mode 100644
index 00000000..6d64df2a
--- /dev/null
+++ b/src/mantle/testing/concerns/trait-reads-annotations.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Reads_Annotations trait file
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Testing\Concerns;
+
+use PHPUnit\Metadata\Annotation\Parser\DocBlock;
+use PHPUnit\Metadata\Annotation\Parser\Registry;
+use PHPUnit\Util\Test;
+
+/**
+ * Read annotations for testing that supports multiple versions of PHPUnit.
+ *
+ * @mixin \PHPUnit\Framework\TestCase
+ */
+trait Reads_Annotations {
+	/**
+	 * Read annotations for the current test case and method.
+	 *
+	 * @return array
+	 */
+	public function get_annotations_for_method(): array {
+		// PHPUnit 9.4 and below method.
+		if ( method_exists( $this, 'getAnnotations' ) ) {
+			return $this->getAnnotations();
+		}
+
+		// Use the PHPUnit ^9.5 method if available.
+		if ( method_exists( Test::class, 'parseTestMethodAnnotations' ) ) { // @phpstan-ignore-line
+			return Test::parseTestMethodAnnotations(
+				static::class,
+				$this->getName(), // @phpstan-ignore-line
+			);
+		}
+
+		// Use the PHPUnit 10.x method if available.
+		if ( class_exists( Registry::class ) && class_exists( DocBlock::class ) ) {
+			$registry = Registry::getInstance();
+
+			return [
+				'class'  => $registry->forClassName( static::class )->symbolAnnotations(),
+				'method' => $registry->forMethod( static::class, $this->name() )->symbolAnnotations(),
+			];
+		}
+
+		// Throw a warning if we can't read annotations.
+		trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
+			'Unable to read annotations for test method. Please file an issue with https://github.com/alleyinteractive/mantle-framework',
+			E_USER_WARNING
+		);
+
+		return [];
+	}
+}
diff --git a/src/mantle/testkit/composer.json b/src/mantle/testkit/composer.json
index 5049aa74..c707523b 100644
--- a/src/mantle/testkit/composer.json
+++ b/src/mantle/testkit/composer.json
@@ -13,9 +13,9 @@
         "mantle-framework/faker": "^0.12",
         "mantle-framework/support": "^0.12",
         "mantle-framework/testing": "^0.12",
-        "nunomaduro/collision": "^6.4",
-        "phpunit/phpunit": "^9.6.10",
-        "symfony/http-foundation": "^6.0.20"
+        "nunomaduro/collision": "^6.0 || ^7.0",
+        "phpunit/phpunit": "^9.3.3|^10.0.7",
+        "symfony/http-foundation": "^6.0"
     },
     "extra": {
         "wordpress-autoloader": {
diff --git a/tests/assets/test-asset-loader.php b/tests/Assets/AssetLoaderTest.php
similarity index 93%
rename from tests/assets/test-asset-loader.php
rename to tests/Assets/AssetLoaderTest.php
index 8b2e5ac1..53b8c3d7 100644
--- a/tests/assets/test-asset-loader.php
+++ b/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,
 		);
 
diff --git a/tests/assets/test-asset-manager.php b/tests/Assets/AssetManagerTest.php
similarity index 75%
rename from tests/assets/test-asset-manager.php
rename to tests/Assets/AssetManagerTest.php
index f2d64db8..43fb6f6b 100644
--- a/tests/assets/test-asset-manager.php
+++ b/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(),
 		);
 	}
diff --git a/tests/assets/class-test-case.php b/tests/Assets/TestCase.php
similarity index 95%
rename from tests/assets/class-test-case.php
rename to tests/Assets/TestCase.php
index 5773d3c1..0d2a7313 100644
--- a/tests/assets/class-test-case.php
+++ b/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();
 	}
 
diff --git a/tests/cache/test-cache-manager.php b/tests/Cache/CacheManagerTest.php
similarity index 97%
rename from tests/cache/test-cache-manager.php
rename to tests/Cache/CacheManagerTest.php
index aeae9f91..6bc70c21 100644
--- a/tests/cache/test-cache-manager.php
+++ b/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].' );
diff --git a/tests/config/test-repository.php b/tests/Config/RepositoryTest.php
similarity index 97%
rename from tests/config/test-repository.php
rename to tests/Config/RepositoryTest.php
index 7858361f..7f1b53cd 100644
--- a/tests/config/test-repository.php
+++ b/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
 	 */
diff --git a/tests/console/test-command.php b/tests/Console/CommandTest.php
similarity index 98%
rename from tests/console/test-command.php
rename to tests/Console/CommandTest.php
index a5c15a24..ceab1625 100644
--- a/tests/console/test-command.php
+++ b/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 {
diff --git a/tests/console/test-generator-command.php b/tests/Console/GeneratorCommandTest.php
similarity index 98%
rename from tests/console/test-generator-command.php
rename to tests/Console/GeneratorCommandTest.php
index 6622020b..46b25add 100644
--- a/tests/console/test-generator-command.php
+++ b/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
 	 */
diff --git a/tests/console/test-hook-usage-command.php b/tests/Console/HookUsageCommandTest.php.bak
similarity index 96%
rename from tests/console/test-hook-usage-command.php
rename to tests/Console/HookUsageCommandTest.php.bak
index 0618b1af..06b8c35d 100644
--- a/tests/console/test-hook-usage-command.php
+++ b/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();
diff --git a/tests/console/test-parser.php b/tests/Console/ParserTest.php
similarity index 99%
rename from tests/console/test-parser.php
rename to tests/Console/ParserTest.php
index a4d35190..71674889 100644
--- a/tests/console/test-parser.php
+++ b/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' );
diff --git a/tests/console/generators/test-printer.php b/tests/Console/generators/PrinterTest.php
similarity index 98%
rename from tests/console/generators/test-printer.php
rename to tests/Console/generators/PrinterTest.php
index badb2e83..4b9b8bf5 100644
--- a/tests/console/generators/test-printer.php
+++ b/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;
 
diff --git a/tests/console/hook-usage/base-example.php b/tests/Console/hook-usage/base-example.php
similarity index 100%
rename from tests/console/hook-usage/base-example.php
rename to tests/Console/hook-usage/base-example.php
diff --git a/tests/console/hook-usage/sub/sub-example.php b/tests/Console/hook-usage/sub/sub-example.php
similarity index 100%
rename from tests/console/hook-usage/sub/sub-example.php
rename to tests/Console/hook-usage/sub/sub-example.php
diff --git a/tests/console/test.stub b/tests/Console/test.stub
similarity index 100%
rename from tests/console/test.stub
rename to tests/Console/test.stub
diff --git a/tests/container/test-container-call.php b/tests/Container/ContainerCallTest.php
similarity index 99%
rename from tests/container/test-container-call.php
rename to tests/Container/ContainerCallTest.php
index 62a14321..0b575a61 100644
--- a/tests/container/test-container-call.php
+++ b/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(
diff --git a/tests/container/test-container.php b/tests/Container/ContainerTest.php
similarity index 99%
rename from tests/container/test-container.php
rename to tests/Container/ContainerTest.php
index aab2526b..cb3330d5 100644
--- a/tests/container/test-container.php
+++ b/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() )
diff --git a/tests/database/factory/test-factory.php b/tests/Database/Factory/FactoryTest.php
similarity index 99%
rename from tests/database/factory/test-factory.php
rename to tests/Database/Factory/FactoryTest.php
index 67cd6992..08cde70c 100644
--- a/tests/database/factory/test-factory.php
+++ b/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();
 
diff --git a/tests/database/factory/test-unit-testing-factory.php b/tests/Database/Factory/UnitTestingFactoryTest.php
similarity index 99%
rename from tests/database/factory/test-unit-testing-factory.php
rename to tests/Database/Factory/UnitTestingFactoryTest.php
index 54cf3b81..2a75c210 100644
--- a/tests/database/factory/test-unit-testing-factory.php
+++ b/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() {
diff --git a/tests/database/model/test-attachment.php b/tests/Database/Model/AttachmentTest.php
similarity index 93%
rename from tests/database/model/test-attachment.php
rename to tests/Database/Model/AttachmentTest.php
index 78d479f7..ed9d15b3 100644
--- a/tests/database/model/test-attachment.php
+++ b/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
 	 */
diff --git a/tests/database/model/test-comment-object.php b/tests/Database/Model/CommentObjectTest.php
similarity index 97%
rename from tests/database/model/test-comment-object.php
rename to tests/Database/Model/CommentObjectTest.php
index c5161fb1..185ac08e 100644
--- a/tests/database/model/test-comment-object.php
+++ b/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 );
diff --git a/tests/database/model/test-model-scope.php b/tests/Database/Model/ModelScopeTest.php
similarity index 98%
rename from tests/database/model/test-model-scope.php
rename to tests/Database/Model/ModelScopeTest.php
index 8986932b..06b60458 100644
--- a/tests/database/model/test-model-scope.php
+++ b/tests/Database/Model/ModelScopeTest.php
@@ -9,7 +9,7 @@
 use Mantle\Database\Query\Post_Query_Builder;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Model_Scope extends Framework_Test_Case {
+class ModelScopeTest extends Framework_Test_Case {
 	public function test_local_scope() {
 		$post_id = $this->get_random_post_id();
 
diff --git a/tests/database/model/test-model.php b/tests/Database/Model/ModelTest.php
similarity index 99%
rename from tests/database/model/test-model.php
rename to tests/Database/Model/ModelTest.php
index 1a830b35..f0ac5b15 100644
--- a/tests/database/model/test-model.php
+++ b/tests/Database/Model/ModelTest.php
@@ -9,7 +9,7 @@
 /**
  * Test non-WordPress specific logic of the model
  */
-class Test_Model extends Framework_Test_Case {
+class ModelTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/database/model/test-permalink-generator.php b/tests/Database/Model/PermalinkGeneratorTest.php
similarity index 94%
rename from tests/database/model/test-permalink-generator.php
rename to tests/Database/Model/PermalinkGeneratorTest.php
index 9481b04e..92b9892c 100644
--- a/tests/database/model/test-permalink-generator.php
+++ b/tests/Database/Model/PermalinkGeneratorTest.php
@@ -5,7 +5,7 @@
 use Mantle\Database\Model\Post;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Permalink_Generator extends Framework_Test_Case {
+class PermalinkGeneratorTest extends Framework_Test_Case {
 	public function test_generate_permalink() {
 		$post  = static::factory()->post->create_and_get();
 		$model = Testable_Post_Generator::find( $post->ID );
diff --git a/tests/database/model/test-post-model-events.php b/tests/Database/Model/PostModelEventsTest.php
similarity index 98%
rename from tests/database/model/test-post-model-events.php
rename to tests/Database/Model/PostModelEventsTest.php
index f78a3eb7..72b73674 100644
--- a/tests/database/model/test-post-model-events.php
+++ b/tests/Database/Model/PostModelEventsTest.php
@@ -7,7 +7,7 @@
 /**
  * Test non-WordPress specific logic of the model
  */
-class Test_Post_Model_Events extends Framework_Test_Case {
+class PostModelEventsTest extends Framework_Test_Case {
 	public function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/database/model/test-post-object.php b/tests/Database/Model/PostObjectTest.php
similarity index 99%
rename from tests/database/model/test-post-object.php
rename to tests/Database/Model/PostObjectTest.php
index 6ecc6a01..9becccce 100644
--- a/tests/database/model/test-post-object.php
+++ b/tests/Database/Model/PostObjectTest.php
@@ -10,7 +10,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class Test_Post_Object extends Framework_Test_Case {
+class PostObjectTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/database/model/test-rest-field.php b/tests/Database/Model/RestFieldTest.php
similarity index 93%
rename from tests/database/model/test-rest-field.php
rename to tests/Database/Model/RestFieldTest.php
index 6a0aa92f..ca8b5536 100644
--- a/tests/database/model/test-rest-field.php
+++ b/tests/Database/Model/RestFieldTest.php
@@ -5,7 +5,7 @@
 use Mantle\Database\Model\Registration\Register_Rest_Fields;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Rest_Field extends Framework_Test_Case {
+class RestFieldTest extends Framework_Test_Case {
 	public function test_rest_field() {
 		Testable_Model_With_Rest_Field::boot_if_not_booted();
 
diff --git a/tests/database/model/test-site-object.php b/tests/Database/Model/SiteObjectTest.php
similarity index 94%
rename from tests/database/model/test-site-object.php
rename to tests/Database/Model/SiteObjectTest.php
index 00537b04..e58c26d6 100644
--- a/tests/database/model/test-site-object.php
+++ b/tests/Database/Model/SiteObjectTest.php
@@ -6,7 +6,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class Test_Site_Object extends Framework_Test_Case {
+class SiteObjectTest extends Framework_Test_Case {
 	use Multisite_Test;
 
 	public function test_site_attributes() {
diff --git a/tests/database/model/test-term-model-events.php b/tests/Database/Model/TermModelEventsTest.php
similarity index 98%
rename from tests/database/model/test-term-model-events.php
rename to tests/Database/Model/TermModelEventsTest.php
index 42b4d69e..e5496388 100644
--- a/tests/database/model/test-term-model-events.php
+++ b/tests/Database/Model/TermModelEventsTest.php
@@ -7,7 +7,7 @@
 /**
  * Test non-WordPress specific logic of the model
  */
-class Test_Term_Model_Events extends Framework_Test_Case {
+class TermModelEventsTest extends Framework_Test_Case {
 	public function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/database/model/test-term-object.php b/tests/Database/Model/TermObjectTest.php
similarity index 98%
rename from tests/database/model/test-term-object.php
rename to tests/Database/Model/TermObjectTest.php
index d8c127d1..0aac358b 100644
--- a/tests/database/model/test-term-object.php
+++ b/tests/Database/Model/TermObjectTest.php
@@ -8,7 +8,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class Test_Term_Object extends Framework_Test_Case {
+class TermObjectTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		Example_Taxonomy::register_object();
diff --git a/tests/database/model/test-user-object.php b/tests/Database/Model/UserObjectTest.php
similarity index 97%
rename from tests/database/model/test-user-object.php
rename to tests/Database/Model/UserObjectTest.php
index 41935e03..07bcfa5c 100644
--- a/tests/database/model/test-user-object.php
+++ b/tests/Database/Model/UserObjectTest.php
@@ -5,7 +5,7 @@
 use Mantle\Database\Model\User;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_User_Object extends Framework_Test_Case {
+class UserObjectTest extends Framework_Test_Case {
 	/**
 	 * @var Factory
 	 */
diff --git a/tests/database/model/registration/test-register-meta.php b/tests/Database/Model/registration/RegisterMetaTest.php
similarity index 95%
rename from tests/database/model/registration/test-register-meta.php
rename to tests/Database/Model/registration/RegisterMetaTest.php
index 1853b460..25a59c1d 100644
--- a/tests/database/model/registration/test-register-meta.php
+++ b/tests/Database/Model/registration/RegisterMetaTest.php
@@ -6,7 +6,7 @@
 use Mantle\Database\Model\Registration\Register_Meta;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Register_Meta extends Framework_Test_Case {
+class RegisterMetaTest extends Framework_Test_Case {
 	public function test_register_meta() {
 		$this->expectApplied( 'mantle_register_meta_default_args' )->once()->andReturn(
 			[
diff --git a/tests/database/model/registration/test-register-post-type.php b/tests/Database/Model/registration/RegisterPostTypeTest.php
similarity index 98%
rename from tests/database/model/registration/test-register-post-type.php
rename to tests/Database/Model/registration/RegisterPostTypeTest.php
index 4a93f25c..3864aa7e 100644
--- a/tests/database/model/registration/test-register-post-type.php
+++ b/tests/Database/Model/registration/RegisterPostTypeTest.php
@@ -11,7 +11,7 @@
 use Mantle\REST_API\Registered_REST_Field;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Register_Post_Type extends Framework_Test_Case {
+class RegisterPostTypeTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		remove_all_actions( 'init' );
diff --git a/tests/database/model/registration/test-register-taxonomy.php b/tests/Database/Model/registration/RegisterTaxonomyTest.php
similarity index 96%
rename from tests/database/model/registration/test-register-taxonomy.php
rename to tests/Database/Model/registration/RegisterTaxonomyTest.php
index 29366ad6..e053c028 100644
--- a/tests/database/model/registration/test-register-taxonomy.php
+++ b/tests/Database/Model/registration/RegisterTaxonomyTest.php
@@ -6,7 +6,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mockery as m;
 
-class Test_Register_Taxonomy extends Framework_Test_Case {
+class RegisterTaxonomyTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		remove_all_actions( 'init' );
diff --git a/tests/database/model/relations/test-belongs-to-one-or-many.php b/tests/Database/Model/relations/BelongsToOneOrManyTest.php
similarity index 98%
rename from tests/database/model/relations/test-belongs-to-one-or-many.php
rename to tests/Database/Model/relations/BelongsToOneOrManyTest.php
index 8b96f577..e58c866f 100644
--- a/tests/database/model/relations/test-belongs-to-one-or-many.php
+++ b/tests/Database/Model/relations/BelongsToOneOrManyTest.php
@@ -11,7 +11,7 @@
 use Mantle\Database\Model\Term;
 use Mantle\Database\Model_Service_Provider;
 
-class Test_Belongs_To_One_Or_Many extends Framework_Test_Case {
+class BelongsToOneOrManyTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/database/model/relations/test-has-one-or-many.php b/tests/Database/Model/relations/HasOneOrManyTest.php
similarity index 99%
rename from tests/database/model/relations/test-has-one-or-many.php
rename to tests/Database/Model/relations/HasOneOrManyTest.php
index 223ad9a8..c8dd0054 100644
--- a/tests/database/model/relations/test-has-one-or-many.php
+++ b/tests/Database/Model/relations/HasOneOrManyTest.php
@@ -12,7 +12,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class Test_Has_One_Or_Many extends Framework_Test_Case {
+class HasOneOrManyTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/database/query/test-eager-load-relationships.php b/tests/Database/Query/EagerLoadRelationshipsTest.php
similarity index 99%
rename from tests/database/query/test-eager-load-relationships.php
rename to tests/Database/Query/EagerLoadRelationshipsTest.php
index 52d52d8a..9d458f56 100644
--- a/tests/database/query/test-eager-load-relationships.php
+++ b/tests/Database/Query/EagerLoadRelationshipsTest.php
@@ -9,7 +9,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class Test_Eager_Load_Relationships extends Framework_Test_Case {
+class EagerLoadRelationshipsTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/database/query/test-paginator.php b/tests/Database/Query/PaginatorTest.php
similarity index 99%
rename from tests/database/query/test-paginator.php
rename to tests/Database/Query/PaginatorTest.php
index dcafc0f3..0f415c0f 100644
--- a/tests/database/query/test-paginator.php
+++ b/tests/Database/Query/PaginatorTest.php
@@ -7,7 +7,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class Test_Paginator extends Framework_Test_Case {
+class PaginatorTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	public function test_simple_paginate_url_query_string() {
diff --git a/tests/database/query/test-post-query-builder.php b/tests/Database/Query/PostQueryBuilderTest.php
similarity index 99%
rename from tests/database/query/test-post-query-builder.php
rename to tests/Database/Query/PostQueryBuilderTest.php
index 73c0ba32..4e52448c 100644
--- a/tests/database/query/test-post-query-builder.php
+++ b/tests/Database/Query/PostQueryBuilderTest.php
@@ -13,7 +13,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class Test_Post_Query_Builder extends Framework_Test_Case {
+class PostQueryBuilderTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/database/query/test-post-query-relationships.php b/tests/Database/Query/PostQueryRelationshipsTest.php
similarity index 97%
rename from tests/database/query/test-post-query-relationships.php
rename to tests/Database/Query/PostQueryRelationshipsTest.php
index 6c91ed95..ffc156c4 100644
--- a/tests/database/query/test-post-query-relationships.php
+++ b/tests/Database/Query/PostQueryRelationshipsTest.php
@@ -9,7 +9,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class Test_Post_Query_Relationships extends Framework_Test_Case {
+class PostQueryRelationshipsTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		Utils::delete_all_posts();
 		parent::setUp();
diff --git a/tests/database/query/test-term-query-builder.php b/tests/Database/Query/TermQueryBuilderTest.php
similarity index 98%
rename from tests/database/query/test-term-query-builder.php
rename to tests/Database/Query/TermQueryBuilderTest.php
index 5dbcf0e6..406f2df0 100644
--- a/tests/database/query/test-term-query-builder.php
+++ b/tests/Database/Query/TermQueryBuilderTest.php
@@ -7,7 +7,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class Test_Term_Query_Builder extends Framework_Test_Case {
+class TermQueryBuilderTest extends Framework_Test_Case {
 	public function test_term_by_name() {
 		$tag_id = $this->get_random_term_id();
 		$tag    = \get_term( $tag_id );
diff --git a/tests/events/test-event-dispatcher.php b/tests/Events/EventDispatcherTest.php
similarity index 97%
rename from tests/events/test-event-dispatcher.php
rename to tests/Events/EventDispatcherTest.php
index 3133fd54..de5a9077 100644
--- a/tests/events/test-event-dispatcher.php
+++ b/tests/Events/EventDispatcherTest.php
@@ -8,7 +8,7 @@
 /**
  * @group events
  */
-class Test_Event_Dispatcher extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class EventDispatcherTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	public function testBasicEventExecution() {
 		unset( $_SERVER['__event.test'] );
 		$d = new Dispatcher();
diff --git a/tests/events/test-wordpress-action-dispatcher.php b/tests/Events/WordPressActionDispatcherTest.php
similarity index 98%
rename from tests/events/test-wordpress-action-dispatcher.php
rename to tests/Events/WordPressActionDispatcherTest.php
index 297e0cea..b23ea070 100644
--- a/tests/events/test-wordpress-action-dispatcher.php
+++ b/tests/Events/WordPressActionDispatcherTest.php
@@ -12,7 +12,7 @@
 /**
  * @group events
  */
-class Test_WordPress_Action_Dispatcher extends Framework_Test_Case {
+class WordPressActionDispatcherTest extends Framework_Test_Case {
 	public function test_action_handler() {
 		$_SERVER['__action_fired'] = false;
 
diff --git a/tests/test-faker.php b/tests/FakerTest.php
similarity index 96%
rename from tests/test-faker.php
rename to tests/FakerTest.php
index daf2cf2f..ce37c605 100644
--- a/tests/test-faker.php
+++ b/tests/FakerTest.php
@@ -4,7 +4,7 @@
 use Faker\Factory;
 use Mantle\Faker\Faker_Provider;
 
-class Test_Faker extends \PHPUnit\Framework\TestCase {
+class FakerTest extends \PHPUnit\Framework\TestCase {
 	/**
 	 * @var Factory
 	 */
diff --git a/tests/filesystem/test-filesystem-adapter.php b/tests/Filesystem/FilesystemAdapterTest.php
similarity index 98%
rename from tests/filesystem/test-filesystem-adapter.php
rename to tests/Filesystem/FilesystemAdapterTest.php
index 45b12337..a790fc65 100644
--- a/tests/filesystem/test-filesystem-adapter.php
+++ b/tests/Filesystem/FilesystemAdapterTest.php
@@ -15,7 +15,7 @@
 use Mockery as m;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
-class Test_Filesystem_Adapter extends TestCase {
+class FilesystemAdapterTest extends TestCase {
 	private $temp_dir;
 
 	/**
@@ -137,7 +137,7 @@ public function testDelete() {
 		file_put_contents( $this->temp_dir . '/file.txt', 'Hello World' );
 		$Filesystem_Adapter = new Filesystem_Adapter( $this->filesystem );
 		$this->assertTrue( $Filesystem_Adapter->delete( 'file.txt' ) );
-		Assert::assertFileDoesNotExist( $this->temp_dir . '/file.txt' );
+		$this->assertFileDoesNotExist( $this->temp_dir . '/file.txt' );
 	}
 
 	public function testDeleteReturnsFalseWhenFileNotFound() {
@@ -168,7 +168,7 @@ public function testMove() {
 		$Filesystem_Adapter = new Filesystem_Adapter( $this->filesystem );
 		$Filesystem_Adapter->move( '/foo/foo.txt', '/foo/foo2.txt' );
 
-		Assert::assertFileDoesNotExist( $this->temp_dir . '/foo/foo.txt' );
+		$this->assertFileDoesNotExist( $this->temp_dir . '/foo/foo.txt' );
 
 		$this->assertFileExists( $this->temp_dir . '/foo/foo2.txt' );
 		$this->assertEquals( $data, file_get_contents( $this->temp_dir . '/foo/foo2.txt' ) );
diff --git a/tests/filesystem/test-filesystem-manager.php b/tests/Filesystem/FilesystemManagerTest.php
similarity index 97%
rename from tests/filesystem/test-filesystem-manager.php
rename to tests/Filesystem/FilesystemManagerTest.php
index 1ef4988f..0eef4382 100644
--- a/tests/filesystem/test-filesystem-manager.php
+++ b/tests/Filesystem/FilesystemManagerTest.php
@@ -10,7 +10,7 @@
 use Mantle\Contracts\Filesystem\Filesystem as Filesystem_Contract;
 use function Mantle\Support\Helpers\tap;
 
-class Test_Filesystem_Manager extends TestCase {
+class FilesystemManagerTest extends TestCase {
 	public function test_invalid_disk() {
 		$this->expectException( InvalidArgumentException::class );
 		$this->expectExceptionMessage( 'Disk [unsupported] does not have a configured driver.' );
diff --git a/tests/filesystem/test-filesystem.php b/tests/Filesystem/FilesystemTest.php
similarity index 67%
rename from tests/filesystem/test-filesystem.php
rename to tests/Filesystem/FilesystemTest.php
index b97a8326..e54cb081 100644
--- a/tests/filesystem/test-filesystem.php
+++ b/tests/Filesystem/FilesystemTest.php
@@ -9,7 +9,7 @@
 use SplFileInfo;
 use League\Flysystem\FileNotFoundException;
 
-class Test_Filesystem extends TestCase {
+class FilesystemTest extends TestCase {
 
 	private static $temp_dir;
 
@@ -43,13 +43,13 @@ protected function tearDown(): void {
 	public function testGetRetrievesFiles() {
 		file_put_contents( static::$temp_dir . '/file.txt', 'Hello World' );
 		$files = new Filesystem();
-		Assert::assertSame( 'Hello World', $files->get( static::$temp_dir . '/file.txt' ) );
+		$this->assertSame( 'Hello World', $files->get( static::$temp_dir . '/file.txt' ) );
 	}
 
 	public function testPutStoresFiles() {
 		$files = new Filesystem();
 		$files->put( static::$temp_dir . '/file.txt', 'Hello World' );
-		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
+		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
 	}
 
 	public function testReplaceCreatesFile() {
@@ -58,7 +58,7 @@ public function testReplaceCreatesFile() {
 		$filesystem = new Filesystem();
 
 		$filesystem->replace( $tempFile, 'Hello World' );
-		Assert::assertStringEqualsFile( $tempFile, 'Hello World' );
+		$this->assertStringEqualsFile( $tempFile, 'Hello World' );
 	}
 
 	public function testReplaceWhenUnixSymlinkExists() {
@@ -80,18 +80,18 @@ public function testReplaceWhenUnixSymlinkExists() {
 
 		// Test replacing non-existent file.
 		$filesystem->replace( $tempFile, 'Hello World' );
-		Assert::assertStringEqualsFile( $tempFile, 'Hello World' );
-		Assert::assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
+		$this->assertStringEqualsFile( $tempFile, 'Hello World' );
+		$this->assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
 
 		// Test replacing existing file.
 		$filesystem->replace( $tempFile, 'Something Else' );
-		Assert::assertStringEqualsFile( $tempFile, 'Something Else' );
-		Assert::assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
+		$this->assertStringEqualsFile( $tempFile, 'Something Else' );
+		$this->assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
 
 		// Test replacing symlinked file.
 		$filesystem->replace( $symlink, 'Yet Something Else Again' );
-		Assert::assertStringEqualsFile( $tempFile, 'Yet Something Else Again' );
-		Assert::assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
+		$this->assertStringEqualsFile( $tempFile, 'Yet Something Else Again' );
+		$this->assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
 
 		umask( $originalUmask );
 
@@ -105,7 +105,7 @@ public function testSetChmod() {
 		$files->chmod( static::$temp_dir . '/file.txt', 0755 );
 		$filePermission      = substr( sprintf( '%o', fileperms( static::$temp_dir . '/file.txt' ) ), -4 );
 		$expectedPermissions = DIRECTORY_SEPARATOR == '\\' ? '0666' : '0755';
-		Assert::assertEquals( $expectedPermissions, $filePermission );
+		$this->assertEquals( $expectedPermissions, $filePermission );
 	}
 
 	public function testGetChmod() {
@@ -115,7 +115,7 @@ public function testGetChmod() {
 		$files               = new Filesystem();
 		$filePermission      = $files->chmod( static::$temp_dir . '/file.txt' );
 		$expectedPermissions = DIRECTORY_SEPARATOR == '\\' ? '0666' : '0755';
-		Assert::assertEquals( $expectedPermissions, $filePermission );
+		$this->assertEquals( $expectedPermissions, $filePermission );
 	}
 
 	public function testDeleteRemovesFiles() {
@@ -125,29 +125,29 @@ public function testDeleteRemovesFiles() {
 
 		$files = new Filesystem();
 		$files->delete( static::$temp_dir . '/file1.txt' );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/file1.txt' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/file1.txt' );
 
 		$files->delete( [ static::$temp_dir . '/file2.txt', static::$temp_dir . '/file3.txt' ] );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/file2.txt' );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/file3.txt' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/file2.txt' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/file3.txt' );
 	}
 
 	public function testPrependExistingFiles() {
 		$files = new Filesystem();
 		$files->put( static::$temp_dir . '/file.txt', 'World' );
 		$files->prepend( static::$temp_dir . '/file.txt', 'Hello ' );
-		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
+		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
 	}
 
 	public function testPrependNewFiles() {
 		$files = new Filesystem();
 		$files->prepend( static::$temp_dir . '/file.txt', 'Hello World' );
-		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
+		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
 	}
 
 	public function testMissingFile() {
 		$files = new Filesystem();
-		Assert::assertTrue( $files->missing( static::$temp_dir . '/file.txt' ) );
+		$this->assertTrue( $files->missing( static::$temp_dir . '/file.txt' ) );
 	}
 
 	public function testDeleteDirectory() {
@@ -155,15 +155,15 @@ public function testDeleteDirectory() {
 		file_put_contents( static::$temp_dir . '/foo/file.txt', 'Hello World' );
 		$files = new Filesystem();
 		$files->delete_directory( static::$temp_dir . '/foo' );
-		Assert::assertDirectoryDoesNotExist( static::$temp_dir . '/foo' );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/foo/file.txt' );
+		$this->assertDirectoryDoesNotExist( static::$temp_dir . '/foo' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/foo/file.txt' );
 	}
 
 	public function testDeleteDirectoryReturnFalseWhenNotADirectory() {
 		mkdir( static::$temp_dir . '/bar' );
 		file_put_contents( static::$temp_dir . '/bar/file.txt', 'Hello World' );
 		$files = new Filesystem();
-		Assert::assertFalse( $files->delete_directory( static::$temp_dir . '/bar/file.txt' ) );
+		$this->assertFalse( $files->delete_directory( static::$temp_dir . '/bar/file.txt' ) );
 	}
 
 	public function testCleanDirectory() {
@@ -171,8 +171,8 @@ public function testCleanDirectory() {
 		file_put_contents( static::$temp_dir . '/baz/file.txt', 'Hello World' );
 		$files = new Filesystem();
 		$files->clean_directory( static::$temp_dir . '/baz' );
-		Assert::assertDirectoryExists( static::$temp_dir . '/baz' );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/baz/file.txt' );
+		$this->assertDirectoryExists( static::$temp_dir . '/baz' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/baz/file.txt' );
 	}
 
 	public function testMacro() {
@@ -185,7 +185,7 @@ function () use ( $files, $temp_dir ) {
 				return $files->get( $temp_dir . '/foo.txt' );
 			}
 		);
-		Assert::assertSame( 'Hello World', $files->getFoo() );
+		$this->assertSame( 'Hello World', $files->getFoo() );
 	}
 
 	public function testFilesMethod() {
@@ -195,14 +195,14 @@ public function testFilesMethod() {
 		mkdir( static::$temp_dir . '/views/_layouts' );
 		$files   = new Filesystem();
 		$results = $files->files( static::$temp_dir . '/views' );
-		Assert::assertInstanceOf( SplFileInfo::class, $results[0] );
-		Assert::assertInstanceOf( SplFileInfo::class, $results[1] );
+		$this->assertInstanceOf( SplFileInfo::class, $results[0] );
+		$this->assertInstanceOf( SplFileInfo::class, $results[1] );
 		unset( $files );
 	}
 
 	public function testCopyDirectoryReturnsFalseIfSourceIsntDirectory() {
 		$files = new Filesystem();
-		Assert::assertFalse( $files->copy_directory( static::$temp_dir . '/breeze/boom/foo/bar/baz', static::$temp_dir ) );
+		$this->assertFalse( $files->copy_directory( static::$temp_dir . '/breeze/boom/foo/bar/baz', static::$temp_dir ) );
 	}
 
 	public function testCopyDirectoryMovesEntireDirectory() {
@@ -214,11 +214,11 @@ public function testCopyDirectoryMovesEntireDirectory() {
 
 		$files = new Filesystem();
 		$files->copy_directory( static::$temp_dir . '/tmp', static::$temp_dir . '/tmp2' );
-		Assert::assertDirectoryExists( static::$temp_dir . '/tmp2' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp2/foo.txt' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp2/bar.txt' );
-		Assert::assertDirectoryExists( static::$temp_dir . '/tmp2/nested' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp2/nested/baz.txt' );
+		$this->assertDirectoryExists( static::$temp_dir . '/tmp2' );
+		$this->assertFileExists( static::$temp_dir . '/tmp2/foo.txt' );
+		$this->assertFileExists( static::$temp_dir . '/tmp2/bar.txt' );
+		$this->assertDirectoryExists( static::$temp_dir . '/tmp2/nested' );
+		$this->assertFileExists( static::$temp_dir . '/tmp2/nested/baz.txt' );
 	}
 
 	public function testMoveDirectoryMovesEntireDirectory() {
@@ -230,12 +230,12 @@ public function testMoveDirectoryMovesEntireDirectory() {
 
 		$files = new Filesystem();
 		$files->move_directory( static::$temp_dir . '/tmp2', static::$temp_dir . '/tmp3' );
-		Assert::assertDirectoryExists( static::$temp_dir . '/tmp3' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp3/foo.txt' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp3/bar.txt' );
-		Assert::assertDirectoryExists( static::$temp_dir . '/tmp3/nested' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp3/nested/baz.txt' );
-		Assert::assertDirectoryDoesNotExist( static::$temp_dir . '/tmp2' );
+		$this->assertDirectoryExists( static::$temp_dir . '/tmp3' );
+		$this->assertFileExists( static::$temp_dir . '/tmp3/foo.txt' );
+		$this->assertFileExists( static::$temp_dir . '/tmp3/bar.txt' );
+		$this->assertDirectoryExists( static::$temp_dir . '/tmp3/nested' );
+		$this->assertFileExists( static::$temp_dir . '/tmp3/nested/baz.txt' );
+		$this->assertDirectoryDoesNotExist( static::$temp_dir . '/tmp2' );
 	}
 
 	public function testMoveDirectoryMovesEntireDirectoryAndOverwrites() {
@@ -250,14 +250,14 @@ public function testMoveDirectoryMovesEntireDirectoryAndOverwrites() {
 
 		$files = new Filesystem();
 		$files->move_directory( static::$temp_dir . '/tmp4', static::$temp_dir . '/tmp5', true );
-		Assert::assertDirectoryExists( static::$temp_dir . '/tmp5' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp5/foo.txt' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp5/bar.txt' );
-		Assert::assertDirectoryExists( static::$temp_dir . '/tmp5/nested' );
-		Assert::assertFileExists( static::$temp_dir . '/tmp5/nested/baz.txt' );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/tmp5/foo2.txt' );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/tmp5/bar2.txt' );
-		Assert::assertDirectoryDoesNotExist( static::$temp_dir . '/tmp4' );
+		$this->assertDirectoryExists( static::$temp_dir . '/tmp5' );
+		$this->assertFileExists( static::$temp_dir . '/tmp5/foo.txt' );
+		$this->assertFileExists( static::$temp_dir . '/tmp5/bar.txt' );
+		$this->assertDirectoryExists( static::$temp_dir . '/tmp5/nested' );
+		$this->assertFileExists( static::$temp_dir . '/tmp5/nested/baz.txt' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/tmp5/foo2.txt' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/tmp5/bar2.txt' );
+		$this->assertDirectoryDoesNotExist( static::$temp_dir . '/tmp4' );
 	}
 
 	public function testMoveDirectoryReturnsFalseWhileOverwritingAndUnableToDeleteDestinationDirectory() {
@@ -267,7 +267,7 @@ public function testMoveDirectoryReturnsFalseWhileOverwritingAndUnableToDeleteDe
 
 		$files = m::mock( Filesystem::class )->makePartial();
 		$files->shouldReceive( 'delete_directory' )->once()->andReturn( false );
-		Assert::assertFalse( $files->move_directory( static::$temp_dir . '/tmp6', static::$temp_dir . '/tmp7', true ) );
+		$this->assertFalse( $files->move_directory( static::$temp_dir . '/tmp6', static::$temp_dir . '/tmp7', true ) );
 	}
 
 	public function testGetThrowsExceptionNonexisitingFile() {
@@ -280,7 +280,7 @@ public function testGetThrowsExceptionNonexisitingFile() {
 	public function testGetRequireReturnsProperly() {
 		file_put_contents( static::$temp_dir . '/file.php', '<?php return "Howdy?"; ?>' );
 		$files = new Filesystem();
-		Assert::assertSame( 'Howdy?', $files->get_require( static::$temp_dir . '/file.php' ) );
+		$this->assertSame( 'Howdy?', $files->get_require( static::$temp_dir . '/file.php' ) );
 	}
 
 	public function testGetRequireThrowsExceptionNonExistingFile() {
@@ -294,59 +294,59 @@ public function testAppendAddsDataToFile() {
 		file_put_contents( static::$temp_dir . '/file.txt', 'foo' );
 		$files        = new Filesystem();
 		$bytesWritten = $files->append( static::$temp_dir . '/file.txt', 'bar' );
-		Assert::assertEquals( mb_strlen( 'bar', '8bit' ), $bytesWritten );
-		Assert::assertFileExists( static::$temp_dir . '/file.txt' );
-		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'foobar' );
+		$this->assertEquals( mb_strlen( 'bar', '8bit' ), $bytesWritten );
+		$this->assertFileExists( static::$temp_dir . '/file.txt' );
+		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'foobar' );
 	}
 
 	public function testMoveMovesFiles() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
 		$files->move( static::$temp_dir . '/foo.txt', static::$temp_dir . '/bar.txt' );
-		Assert::assertFileExists( static::$temp_dir . '/bar.txt' );
-		Assert::assertFileDoesNotExist( static::$temp_dir . '/foo.txt' );
+		$this->assertFileExists( static::$temp_dir . '/bar.txt' );
+		$this->assertFileDoesNotExist( static::$temp_dir . '/foo.txt' );
 	}
 
 	public function testNameReturnsName() {
 		file_put_contents( static::$temp_dir . '/foobar.txt', 'foo' );
 		$filesystem = new Filesystem();
-		Assert::assertSame( 'foobar', $filesystem->name( static::$temp_dir . '/foobar.txt' ) );
+		$this->assertSame( 'foobar', $filesystem->name( static::$temp_dir . '/foobar.txt' ) );
 	}
 
 	public function testExtensionReturnsExtension() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		Assert::assertSame( 'txt', $files->extension( static::$temp_dir . '/foo.txt' ) );
+		$this->assertSame( 'txt', $files->extension( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testBasenameReturnsBasename() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		Assert::assertSame( 'foo.txt', $files->basename( static::$temp_dir . '/foo.txt' ) );
+		$this->assertSame( 'foo.txt', $files->basename( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testDirnameReturnsDirectory() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		Assert::assertEquals( static::$temp_dir, $files->dirname( static::$temp_dir . '/foo.txt' ) );
+		$this->assertEquals( static::$temp_dir, $files->dirname( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testTypeIdentifiesFile() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		Assert::assertSame( 'file', $files->type( static::$temp_dir . '/foo.txt' ) );
+		$this->assertSame( 'file', $files->type( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testTypeIdentifiesDirectory() {
 		mkdir( static::$temp_dir . '/foo-dir' );
 		$files = new Filesystem();
-		Assert::assertSame( 'dir', $files->type( static::$temp_dir . '/foo-dir' ) );
+		$this->assertSame( 'dir', $files->type( static::$temp_dir . '/foo-dir' ) );
 	}
 
 	public function testSizeOutputsSize() {
 		$size  = file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		Assert::assertEquals( $size, $files->size( static::$temp_dir . '/foo.txt' ) );
+		$this->assertEquals( $size, $files->size( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	/**
@@ -355,16 +355,16 @@ public function testSizeOutputsSize() {
 	public function testMimeTypeOutputsMimeType() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		Assert::assertSame( 'text/plain', $files->mime_type( static::$temp_dir . '/foo.txt' ) );
+		$this->assertSame( 'text/plain', $files->mime_type( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testIsWritable() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
 		@chmod( static::$temp_dir . '/foo.txt', 0444 );
-		Assert::assertFalse( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
+		$this->assertFalse( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
 		@chmod( static::$temp_dir . '/foo.txt', 0777 );
-		Assert::assertTrue( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
+		$this->assertTrue( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testIsReadable() {
@@ -372,14 +372,14 @@ public function testIsReadable() {
 		$files = new Filesystem();
 		// chmod is noneffective on Windows
 		if ( DIRECTORY_SEPARATOR === '\\' ) {
-			Assert::assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
+			$this->assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
 		} else {
 			@chmod( static::$temp_dir . '/foo.txt', 0000 );
-			Assert::assertFalse( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
+			$this->assertFalse( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
 			@chmod( static::$temp_dir . '/foo.txt', 0777 );
-			Assert::assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
+			$this->assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
 		}
-		Assert::assertFalse( $files->is_readable( static::$temp_dir . '/doesnotexist.txt' ) );
+		$this->assertFalse( $files->is_readable( static::$temp_dir . '/doesnotexist.txt' ) );
 	}
 
 	public function testGlobFindsFiles() {
@@ -387,8 +387,8 @@ public function testGlobFindsFiles() {
 		file_put_contents( static::$temp_dir . '/bar.txt', 'bar' );
 		$files = new Filesystem();
 		$glob  = $files->glob( static::$temp_dir . '/*.txt' );
-		Assert::assertContains( static::$temp_dir . '/foo.txt', $glob );
-		Assert::assertContains( static::$temp_dir . '/bar.txt', $glob );
+		$this->assertContains( static::$temp_dir . '/foo.txt', $glob );
+		$this->assertContains( static::$temp_dir . '/bar.txt', $glob );
 	}
 
 	public function testAllFilesFindsFiles() {
@@ -399,8 +399,8 @@ public function testAllFilesFindsFiles() {
 		foreach ( $files->all_files( static::$temp_dir ) as $file ) {
 			$allFiles[] = $file->getFilename();
 		}
-		Assert::assertContains( 'foo.txt', $allFiles );
-		Assert::assertContains( 'bar.txt', $allFiles );
+		$this->assertContains( 'foo.txt', $allFiles );
+		$this->assertContains( 'bar.txt', $allFiles );
 	}
 
 	public function testDirectoriesFindsDirectories() {
@@ -408,14 +408,14 @@ public function testDirectoriesFindsDirectories() {
 		mkdir( static::$temp_dir . '/music' );
 		$files       = new Filesystem();
 		$directories = $files->directories( static::$temp_dir );
-		Assert::assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'film', $directories );
-		Assert::assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'music', $directories );
+		$this->assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'film', $directories );
+		$this->assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'music', $directories );
 	}
 
 	public function testMakeDirectory() {
 		$files = new Filesystem();
-		Assert::assertTrue( $files->make_directory( static::$temp_dir . '/created' ) );
-		Assert::assertFileExists( static::$temp_dir . '/created' );
+		$this->assertTrue( $files->make_directory( static::$temp_dir . '/created' ) );
+		$this->assertFileExists( static::$temp_dir . '/created' );
 	}
 
 	public function testRequireOnceRequiresFileProperly() {
@@ -425,8 +425,8 @@ public function testRequireOnceRequiresFileProperly() {
 		$filesystem->require_once( static::$temp_dir . '/scripts/foo.php' );
 		file_put_contents( static::$temp_dir . '/scripts/foo.php', '<?php function random_function_xyz_changed(){};' );
 		$filesystem->require_once( static::$temp_dir . '/scripts/foo.php' );
-		Assert::assertTrue( function_exists( 'random_function_xyz' ) );
-		Assert::assertFalse( function_exists( 'random_function_xyz_changed' ) );
+		$this->assertTrue( function_exists( 'random_function_xyz' ) );
+		$this->assertFalse( function_exists( 'random_function_xyz_changed' ) );
 	}
 
 	public function testCopyCopiesFileProperly() {
@@ -435,16 +435,16 @@ public function testCopyCopiesFileProperly() {
 		mkdir( static::$temp_dir . '/text' );
 		file_put_contents( static::$temp_dir . '/text/foo.txt', $data );
 		$filesystem->copy( static::$temp_dir . '/text/foo.txt', static::$temp_dir . '/text/foo2.txt' );
-		Assert::assertFileExists( static::$temp_dir . '/text/foo2.txt' );
-		Assert::assertEquals( $data, file_get_contents( static::$temp_dir . '/text/foo2.txt' ) );
+		$this->assertFileExists( static::$temp_dir . '/text/foo2.txt' );
+		$this->assertEquals( $data, file_get_contents( static::$temp_dir . '/text/foo2.txt' ) );
 	}
 
 	public function testIsFileChecksFilesProperly() {
 		$filesystem = new Filesystem();
 		mkdir( static::$temp_dir . '/help' );
 		file_put_contents( static::$temp_dir . '/help/foo.txt', 'contents' );
-		Assert::assertTrue( $filesystem->is_file( static::$temp_dir . '/help/foo.txt' ) );
-		Assert::assertFalse( $filesystem->is_file( static::$temp_dir . './help' ) );
+		$this->assertTrue( $filesystem->is_file( static::$temp_dir . '/help/foo.txt' ) );
+		$this->assertFalse( $filesystem->is_file( static::$temp_dir . './help' ) );
 	}
 
 	public function testFilesMethodReturnsFileInfoObjects() {
@@ -453,7 +453,7 @@ public function testFilesMethodReturnsFileInfoObjects() {
 		file_put_contents( static::$temp_dir . '/objects/2.txt', '2' );
 		mkdir( static::$temp_dir . '/objects/bar' );
 		$files = new Filesystem();
-		Assert::assertContainsOnlyInstancesOf( SplFileInfo::class, $files->files( static::$temp_dir . '/objects' ) );
+		$this->assertContainsOnlyInstancesOf( SplFileInfo::class, $files->files( static::$temp_dir . '/objects' ) );
 		unset( $files );
 	}
 
@@ -461,13 +461,13 @@ public function testAllFilesReturnsFileInfoObjects() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		file_put_contents( static::$temp_dir . '/bar.txt', 'bar' );
 		$files = new Filesystem();
-		Assert::assertContainsOnlyInstancesOf( SplFileInfo::class, $files->all_files( static::$temp_dir ) );
+		$this->assertContainsOnlyInstancesOf( SplFileInfo::class, $files->all_files( static::$temp_dir ) );
 	}
 
 	public function testHash() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$filesystem = new Filesystem();
-		Assert::assertSame( 'acbd18db4cc2f85cedef654fccc4a4d8', $filesystem->hash( static::$temp_dir . '/foo.txt' ) );
+		$this->assertSame( 'acbd18db4cc2f85cedef654fccc4a4d8', $filesystem->hash( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function test_guess_class_name() {
diff --git a/tests/framework/test-alias-loader.php b/tests/Framework/AliasLoaderTest.php
similarity index 97%
rename from tests/framework/test-alias-loader.php
rename to tests/Framework/AliasLoaderTest.php
index f2c0596a..c108cb3c 100644
--- a/tests/framework/test-alias-loader.php
+++ b/tests/Framework/AliasLoaderTest.php
@@ -5,7 +5,7 @@
 use Mantle\Framework\Alias_Loader;
 use PHPUnit\Framework\TestCase;
 
-class Test_Alias_Loader extends TestCase {
+class AliasLoaderTest extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/framework/test-application.php b/tests/Framework/ApplicationTest.php
similarity index 98%
rename from tests/framework/test-application.php
rename to tests/Framework/ApplicationTest.php
index b8f8c764..2a2260ef 100644
--- a/tests/framework/test-application.php
+++ b/tests/Framework/ApplicationTest.php
@@ -7,7 +7,7 @@
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-class Test_Application extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class ApplicationTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	protected function tearDown(): void {
 		parent::tearDown();
 
diff --git a/tests/framework/test-bootloader.php b/tests/Framework/BootloaderTest.php
similarity index 98%
rename from tests/framework/test-bootloader.php
rename to tests/Framework/BootloaderTest.php
index c860405a..7855df92 100644
--- a/tests/framework/test-bootloader.php
+++ b/tests/Framework/BootloaderTest.php
@@ -9,7 +9,7 @@
 use Mantle\Testing\Concerns\Interacts_With_Hooks;
 use PHPUnit\Framework\TestCase;
 
-class Test_Bootloader extends TestCase {
+class BootloaderTest extends TestCase {
 	use Interacts_With_Hooks;
 
 	public function setUp(): void {
diff --git a/tests/framework/events/test-discover-events.php b/tests/Framework/Events/DiscoverEventsTest.php
similarity index 88%
rename from tests/framework/events/test-discover-events.php
rename to tests/Framework/Events/DiscoverEventsTest.php
index 5b477963..f98e1f1f 100644
--- a/tests/framework/events/test-discover-events.php
+++ b/tests/Framework/Events/DiscoverEventsTest.php
@@ -10,13 +10,17 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class Test_Discover_Events extends Framework_Test_Case {
+class DiscoverEventsTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
 		// Mock a true Mantle application.
 		$this->app['config']->set( 'app.namespace', 'Mantle\\Tests' );
 		$this->app->set_app_path( dirname( __DIR__, 2 ) );
+
+		require_once __DIR__ . '/fixtures/listeners/class-example-listener.php';
+		require_once __DIR__ . '/fixtures/events/class-event-one.php';
+		require_once __DIR__ . '/fixtures/events/class-event-two.php';
 	}
 
 	protected function tearDown(): void {
diff --git a/tests/framework/events/fixtures/events/class-event-one.php b/tests/Framework/Events/fixtures/events/class-event-one.php
similarity index 100%
rename from tests/framework/events/fixtures/events/class-event-one.php
rename to tests/Framework/Events/fixtures/events/class-event-one.php
diff --git a/tests/framework/events/fixtures/events/class-event-two.php b/tests/Framework/Events/fixtures/events/class-event-two.php
similarity index 100%
rename from tests/framework/events/fixtures/events/class-event-two.php
rename to tests/Framework/Events/fixtures/events/class-event-two.php
diff --git a/tests/framework/events/fixtures/listeners/class-example-listener.php b/tests/Framework/Events/fixtures/listeners/class-example-listener.php
similarity index 100%
rename from tests/framework/events/fixtures/listeners/class-example-listener.php
rename to tests/Framework/Events/fixtures/listeners/class-example-listener.php
diff --git a/tests/framework/helpers/test-nullable-comment-objects-test-case.php b/tests/Framework/Helpers/NullableCommentObjectsTestCaseTest.php
similarity index 93%
rename from tests/framework/helpers/test-nullable-comment-objects-test-case.php
rename to tests/Framework/Helpers/NullableCommentObjectsTestCaseTest.php
index df799067..da959488 100644
--- a/tests/framework/helpers/test-nullable-comment-objects-test-case.php
+++ b/tests/Framework/Helpers/NullableCommentObjectsTestCaseTest.php
@@ -14,7 +14,7 @@
 /**
  * Unit tests for nullable comment object functions.
  */
-class Nullable_Comment_Objects_Test_Case extends Framework_Test_Case {
+class NullableCommentObjectsTestCaseTest extends Framework_Test_Case {
 	/**
 	 * Test that `get_comment_object()` returns a comment object.
 	 */
diff --git a/tests/framework/helpers/test-nullable-post-objects-test-case.php b/tests/Framework/Helpers/NullablePostObjectsTestCaseTest.php
similarity index 95%
rename from tests/framework/helpers/test-nullable-post-objects-test-case.php
rename to tests/Framework/Helpers/NullablePostObjectsTestCaseTest.php
index f96a7098..c8178fc7 100644
--- a/tests/framework/helpers/test-nullable-post-objects-test-case.php
+++ b/tests/Framework/Helpers/NullablePostObjectsTestCaseTest.php
@@ -13,7 +13,7 @@
 /**
  * Unit tests for nullable post object functions.
  */
-class Nullable_Post_Objects_Test_Case extends Framework_Test_Case {
+class NullablePostObjectsTestCaseTest extends Framework_Test_Case {
 	/**
 	 * Test that `get_post_object()` returns a post object.
 	 */
diff --git a/tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php b/tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php
new file mode 100644
index 00000000..ae2e5251
--- /dev/null
+++ b/tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Class file for Nullable_Site_Objects_Test_Case
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Tests\Framework\Helpers;
+
+use Mantle\Testing\Framework_Test_Case;
+use function Mantle\Support\Helpers\get_site_object;
+
+/**
+ * Unit tests for nullable site object functions.
+ */
+class NullableSiteObjectsTestCaseTest extends Framework_Test_Case {
+	public function setUp(): void {
+		parent::setUp();
+
+		if ( ! \is_multisite() ) {
+			$this->markTestSkipped( 'Multisite is not enabled.' );
+		}
+	}
+
+	/**
+	 * Test that `get_site_object()` returns a site object.
+	 */
+	public function test_site_object_returns_site() {
+		$known_id = self::factory()->blog->create();
+
+		$found_object = get_site_object( $known_id );
+
+		$this->assertInstanceOf( \WP_Site::class, $found_object );
+
+		$this->assertSame( $known_id, (int) $found_object->blog_id );
+	}
+
+	/**
+	 * Test that `get_site_object()` returns null when there is no site.
+	 */
+	public function test_site_object_returns_null() {
+		$found_object = get_site_object( -99 );
+
+		$this->assertNull( $found_object );
+	}
+}
diff --git a/tests/framework/helpers/test-nullable-term-objects-test-case.php b/tests/Framework/Helpers/NullableTermObjectsTestCaseTest.php
similarity index 98%
rename from tests/framework/helpers/test-nullable-term-objects-test-case.php
rename to tests/Framework/Helpers/NullableTermObjectsTestCaseTest.php
index 1e7c0493..f1834776 100644
--- a/tests/framework/helpers/test-nullable-term-objects-test-case.php
+++ b/tests/Framework/Helpers/NullableTermObjectsTestCaseTest.php
@@ -14,7 +14,7 @@
 /**
  * Unit tests for nullable term object functions.
  */
-class Nullable_Term_Objects_Test_Case extends Framework_Test_Case {
+class NullableTermObjectsTestCaseTest extends Framework_Test_Case {
 	/**
 	 * Test that `get_term_object()` returns a term object.
 	 */
diff --git a/tests/framework/helpers/test-nullable-user-objects-test-case.php b/tests/Framework/Helpers/NullableUserObjectsTestCaseTest.php
similarity index 95%
rename from tests/framework/helpers/test-nullable-user-objects-test-case.php
rename to tests/Framework/Helpers/NullableUserObjectsTestCaseTest.php
index 49447ab0..6ecaeb4b 100644
--- a/tests/framework/helpers/test-nullable-user-objects-test-case.php
+++ b/tests/Framework/Helpers/NullableUserObjectsTestCaseTest.php
@@ -14,7 +14,7 @@
 /**
  * Unit tests for nullable user object functions.
  */
-class Nullable_User_Objects_Test_Case extends Framework_Test_Case {
+class NullableUserObjectsTestCaseTest extends Framework_Test_Case {
 	/**
 	 * Test that `get_user_object()` returns a user object.
 	 */
diff --git a/tests/framework/test-isolated-framework.php b/tests/Framework/IsolatedFrameworkTest.php
similarity index 95%
rename from tests/framework/test-isolated-framework.php
rename to tests/Framework/IsolatedFrameworkTest.php
index ccda175a..67347330 100644
--- a/tests/framework/test-isolated-framework.php
+++ b/tests/Framework/IsolatedFrameworkTest.php
@@ -11,7 +11,7 @@
  * Designed to test the application in complete isolation for use outside of a
  * mantle-based application.
  */
-class Test_Isolated_Framework extends TestCase {
+class IsolatedFrameworkTest extends TestCase {
 	public Application $app;
 
 	protected function setUp(): void {
diff --git a/tests/framework/test-pipeline.php b/tests/Framework/PipelineTest.php
similarity index 100%
rename from tests/framework/test-pipeline.php
rename to tests/Framework/PipelineTest.php
diff --git a/tests/helpers/test-helpers-array.php b/tests/Helpers/HelpersArrayTest.php
similarity index 99%
rename from tests/helpers/test-helpers-array.php
rename to tests/Helpers/HelpersArrayTest.php
index 9cefe50f..ffea296c 100644
--- a/tests/helpers/test-helpers-array.php
+++ b/tests/Helpers/HelpersArrayTest.php
@@ -6,7 +6,7 @@
 use function Mantle\Support\Helpers\data_set;
 use function Mantle\Support\Helpers\value;
 
-class SupportHelpersArrayTest extends TestCase {
+class HelpersArrayTest extends TestCase {
 	public function testValue() {
 		$this->assertSame( 'foo', value( 'foo' ) );
 		$this->assertSame( 'foo', value( function () {
diff --git a/tests/helpers/test-helpers-general.php b/tests/Helpers/HelpersGeneralTest.php
similarity index 98%
rename from tests/helpers/test-helpers-general.php
rename to tests/Helpers/HelpersGeneralTest.php
index 449f830b..b010cb76 100644
--- a/tests/helpers/test-helpers-general.php
+++ b/tests/Helpers/HelpersGeneralTest.php
@@ -19,7 +19,7 @@
 use function Mantle\Support\Helpers\transform;
 use function Mantle\Support\Helpers\with;
 
-class SupportHelpersGeneralTest extends TestCase {
+class HelpersGeneralTest extends TestCase {
 	public function testClassBasename() {
 		$this->assertSame( 'Baz', class_basename( 'Foo\Bar\Baz' ) );
 		$this->assertSame( 'Baz', class_basename( 'Baz' ) );
@@ -178,7 +178,7 @@ public function testWith() {
 		} ) );
 	}
 
-	public function providesPregReplaceArrayData() {
+	public static function providesPregReplaceArrayData() {
 		$pointerArray = [ 'Taylor', 'Otwell' ];
 
 		next( $pointerArray );
diff --git a/tests/helpers/test-helpers.php b/tests/Helpers/HelpersTest.php
similarity index 98%
rename from tests/helpers/test-helpers.php
rename to tests/Helpers/HelpersTest.php
index 69d9dca0..72fd9e52 100644
--- a/tests/helpers/test-helpers.php
+++ b/tests/Helpers/HelpersTest.php
@@ -15,7 +15,7 @@
 use function Mantle\Support\Helpers\is_local_env;
 use function Mantle\Support\Helpers\logger;
 
-class Test_Helpers extends TestCase {
+class HelpersTest extends TestCase {
 	protected Application $app;
 	protected Log_Manager $instance;
 	protected TestHandler $handler;
diff --git a/tests/http/test-controller.php b/tests/Http/ControllerTest.php
similarity index 97%
rename from tests/http/test-controller.php
rename to tests/Http/ControllerTest.php
index 12b8112c..9a48bfeb 100644
--- a/tests/http/test-controller.php
+++ b/tests/Http/ControllerTest.php
@@ -13,7 +13,7 @@
 use Mantle\Http\Request;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Controller extends Framework_Test_Case {
+class ControllerTest extends Framework_Test_Case {
 	public function test_controller_at_method() {
 		Route::get( '/example-controller-at-route', Example_Controller::class . '@example_method' );
 
diff --git a/tests/http/test-redirector.php b/tests/Http/RedirectorTest.php
similarity index 98%
rename from tests/http/test-redirector.php
rename to tests/Http/RedirectorTest.php
index 6309b8ed..cbe063e1 100644
--- a/tests/http/test-redirector.php
+++ b/tests/Http/RedirectorTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
-class Test_Redirector extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class RedirectorTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 
 	/**
 	 * @var Request
diff --git a/tests/http/test-response-factory.php b/tests/Http/ResponseFactoryTest.php
similarity index 93%
rename from tests/http/test-response-factory.php
rename to tests/Http/ResponseFactoryTest.php
index b036e1e0..7d3f73a2 100644
--- a/tests/http/test-response-factory.php
+++ b/tests/Http/ResponseFactoryTest.php
@@ -9,7 +9,7 @@
 
 use Mantle\Http\Request;
 
-class Test_Response_Factory extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class ResponseFactoryTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/http/test-router.php b/tests/Http/RouterTest.php
similarity index 99%
rename from tests/http/test-router.php
rename to tests/Http/RouterTest.php
index 54634ba5..c7600bb3 100644
--- a/tests/http/test-router.php
+++ b/tests/Http/RouterTest.php
@@ -10,7 +10,7 @@
 use Mantle\Http\Routing\Router;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Router extends Framework_Test_Case {
+class RouterTest extends Framework_Test_Case {
 	public function test_basic_dispatching() {
 		$router = $this->get_router();
 		$router->get(
diff --git a/tests/http/routing/test-post-model-routing.php b/tests/Http/Routing/PostModelRoutingTest.php
similarity index 97%
rename from tests/http/routing/test-post-model-routing.php
rename to tests/Http/Routing/PostModelRoutingTest.php
index 35cf7c2d..01b29443 100644
--- a/tests/http/routing/test-post-model-routing.php
+++ b/tests/Http/Routing/PostModelRoutingTest.php
@@ -11,7 +11,7 @@
 use Mantle\Http\Routing\Middleware\Wrap_Template;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Post_Model_Routing extends Framework_Test_Case {
+class PostModelRoutingTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/http/routing/test-rest-api-routing.php b/tests/Http/Routing/RestApiRoutingTest.php
similarity index 98%
rename from tests/http/routing/test-rest-api-routing.php
rename to tests/Http/Routing/RestApiRoutingTest.php
index ffcabb3e..fcae6ab1 100644
--- a/tests/http/routing/test-rest-api-routing.php
+++ b/tests/Http/Routing/RestApiRoutingTest.php
@@ -9,7 +9,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use WP_REST_Request;
 
-class Test_REST_API_Routing extends Framework_Test_Case {
+class RestApiRoutingTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	public function test_generic_route() {
diff --git a/tests/http/routing/test-term-model-routing.php b/tests/Http/Routing/TermModelRoutingTest.php
similarity index 98%
rename from tests/http/routing/test-term-model-routing.php
rename to tests/Http/Routing/TermModelRoutingTest.php
index 2d880034..af327a47 100644
--- a/tests/http/routing/test-term-model-routing.php
+++ b/tests/Http/Routing/TermModelRoutingTest.php
@@ -14,7 +14,7 @@
 use Mantle\Http\Routing\Middleware\Wrap_Template;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Term_Model_Routing extends Framework_Test_Case {
+class TermModelRoutingTest extends Framework_Test_Case {
 	public function test_category_term() {
 		Testable_Category_Model::boot_if_not_booted();
 
diff --git a/tests/http/test-uploaded-file.php b/tests/Http/UploadedFileTest.php
similarity index 94%
rename from tests/http/test-uploaded-file.php
rename to tests/Http/UploadedFileTest.php
index 16659197..07931b70 100644
--- a/tests/http/test-uploaded-file.php
+++ b/tests/Http/UploadedFileTest.php
@@ -6,7 +6,7 @@
 use Mantle\Http\Uploaded_File;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Uploaded_File extends Framework_Test_Case {
+class UploadedFileTest extends Framework_Test_Case {
 
 	public function testUploadedFileCanRetrieveContentsFromTextFile() {
 		$file = new Uploaded_File(
diff --git a/tests/http/test-url-generator.php b/tests/Http/UrlGeneratorTest.php
similarity index 98%
rename from tests/http/test-url-generator.php
rename to tests/Http/UrlGeneratorTest.php
index 3c993700..76ede318 100644
--- a/tests/http/test-url-generator.php
+++ b/tests/Http/UrlGeneratorTest.php
@@ -11,7 +11,7 @@
 use Mantle\Http\Routing\Url_Generator;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Url_Generator extends Framework_Test_Case {
+class UrlGeneratorTest extends Framework_Test_Case {
 	protected Router $router;
 
 	protected Url_Generator $url;
diff --git a/tests/http-client/test-http-client.php b/tests/HttpClient/HttpClientTest.php
similarity index 99%
rename from tests/http-client/test-http-client.php
rename to tests/HttpClient/HttpClientTest.php
index 9a2642ce..3a3cd9bb 100644
--- a/tests/http-client/test-http-client.php
+++ b/tests/HttpClient/HttpClientTest.php
@@ -18,7 +18,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Mock_Http_Response;
 
-class Test_Http_Client extends Framework_Test_Case {
+class HttpClientTest extends Framework_Test_Case {
 	protected Factory $http_factory;
 
 	protected function setUp(): void {
diff --git a/tests/log/test-log-manager.php b/tests/Log/LogManagerTest.php
similarity index 97%
rename from tests/log/test-log-manager.php
rename to tests/Log/LogManagerTest.php
index bad4cf3d..4d4bc4f2 100644
--- a/tests/log/test-log-manager.php
+++ b/tests/Log/LogManagerTest.php
@@ -8,7 +8,7 @@
 use Mantle\Log\Log_Manager;
 use Monolog\Handler\TestHandler;
 
-class Test_Log_Manager extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class LogManagerTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 
 	/**
 	 * @var Application
diff --git a/tests/queue/test-dispatcher.php b/tests/Queue/DispatcherTest.php
similarity index 96%
rename from tests/queue/test-dispatcher.php
rename to tests/Queue/DispatcherTest.php
index 2d8d5a91..745193b2 100644
--- a/tests/queue/test-dispatcher.php
+++ b/tests/Queue/DispatcherTest.php
@@ -16,7 +16,7 @@
 /**
  * @group queue
  */
-class Test_Dispatcher extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class DispatcherTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	/**
 	 * Provider instance.
 	 *
diff --git a/tests/queue/test-queue-manager.php b/tests/Queue/QueueManagerTest.php
similarity index 94%
rename from tests/queue/test-queue-manager.php
rename to tests/Queue/QueueManagerTest.php
index 9eab6995..6975357a 100644
--- a/tests/queue/test-queue-manager.php
+++ b/tests/Queue/QueueManagerTest.php
@@ -10,7 +10,7 @@
 /**
  * @group queue
  */
-class Test_Queue_Manager extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class QueueManagerTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	public function test_default_connection() {
 		$provider = m::mock( Provider::class );
 
diff --git a/tests/queue/test-worker.php b/tests/Queue/WorkerTest.php
similarity index 98%
rename from tests/queue/test-worker.php
rename to tests/Queue/WorkerTest.php
index 909c9970..1d5d426f 100644
--- a/tests/queue/test-worker.php
+++ b/tests/Queue/WorkerTest.php
@@ -18,7 +18,7 @@
 /**
  * @group queue
  */
-class Test_Worker extends MockeryTestCase {
+class WorkerTest extends MockeryTestCase {
 
 	/**
 	 * Application instance.
diff --git a/tests/queue/providers/test-wordpress-cron-queue.php b/tests/Queue/providers/WordPressCronQueueTest.php
similarity index 98%
rename from tests/queue/providers/test-wordpress-cron-queue.php
rename to tests/Queue/providers/WordPressCronQueueTest.php
index 93fa00d4..9676ccf8 100644
--- a/tests/queue/providers/test-wordpress-cron-queue.php
+++ b/tests/Queue/providers/WordPressCronQueueTest.php
@@ -21,7 +21,7 @@
  * @group queue
  * @group wordpress-queue
  */
-class Test_WordPress_Cron_Queue extends Framework_Test_Case {
+class WordPressCronQueueTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/scheduling/test-event.php b/tests/Scheduling/EventTest.php
similarity index 97%
rename from tests/scheduling/test-event.php
rename to tests/Scheduling/EventTest.php
index 15163e9d..9a949020 100644
--- a/tests/scheduling/test-event.php
+++ b/tests/Scheduling/EventTest.php
@@ -8,7 +8,7 @@
 use Mantle\Testing\Mock_Http_Response;
 use Mockery as m;
 
-class Test_Event extends Framework_Test_Case {
+class EventTest extends Framework_Test_Case {
 	protected function tearDown(): void {
 		parent::tearDown();
 
diff --git a/tests/scheduling/test-frequency.php b/tests/Scheduling/FrequencyTest.php
similarity index 98%
rename from tests/scheduling/test-frequency.php
rename to tests/Scheduling/FrequencyTest.php
index 4dbc3c0a..172adf57 100644
--- a/tests/scheduling/test-frequency.php
+++ b/tests/Scheduling/FrequencyTest.php
@@ -6,7 +6,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mockery as m;
 
-class Test_Frequency extends Framework_Test_Case {
+class FrequencyTest extends Framework_Test_Case {
 
 	/*
 	 * @var Event
diff --git a/tests/support/test-arr.php b/tests/Support/ArrTest.php
similarity index 99%
rename from tests/support/test-arr.php
rename to tests/Support/ArrTest.php
index 8cdd7521..b0b2b092 100644
--- a/tests/support/test-arr.php
+++ b/tests/Support/ArrTest.php
@@ -10,7 +10,7 @@
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
-class Test_Arr extends TestCase {
+class ArrTest extends TestCase {
 
 	public function testAccessible() {
 		$this->assertTrue( Arr::accessible( [] ) );
diff --git a/tests/support/test-collection.php b/tests/Support/CollectionTest.php
similarity index 99%
rename from tests/support/test-collection.php
rename to tests/Support/CollectionTest.php
index 1db26c81..76079491 100644
--- a/tests/support/test-collection.php
+++ b/tests/Support/CollectionTest.php
@@ -21,7 +21,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class Test_Collection extends Framework_Test_Case {
+class CollectionTest extends Framework_Test_Case {
 	/**
 	 * @dataProvider collectionClassProvider
 	 */
@@ -320,7 +320,7 @@ public function testJsonSerializeCallsToArrayOrJsonSerializeOnEachItemInCollecti
 	 */
 	public function testToJsonEncodesTheJsonSerializeResult($collection)
 	{
-		$c = $this->getMockBuilder($collection)->setMethods(['jsonSerialize'])->getMock();
+		$c = $this->getMockBuilder($collection)->onlyMethods(['jsonSerialize'])->getMock();
 		$c->expects($this->once())->method('jsonSerialize')->willReturn('foo');
 		$results = $c->to_json();
 		$this->assertJsonStringEqualsJsonString(json_encode('foo'), $results);
@@ -331,7 +331,7 @@ public function testToJsonEncodesTheJsonSerializeResult($collection)
 	 */
 	public function testCastingToStringJsonEncodesTheToArrayResult($collection)
 	{
-		$c = $this->getMockBuilder($collection)->setMethods(['jsonSerialize'])->getMock();
+		$c = $this->getMockBuilder($collection)->onlyMethods(['jsonSerialize'])->getMock();
 		$c->expects($this->once())->method('jsonSerialize')->willReturn('foo');
 
 		$this->assertJsonStringEqualsJsonString(json_encode('foo'), (string) $c);
@@ -4336,7 +4336,7 @@ public function test_from_fallback( $collection ) {
 	 *
 	 * @return array
 	 */
-	public function collectionClassProvider()
+	public static function collectionClassProvider()
 	{
 		return [
 			[Collection::class],
diff --git a/tests/support/test-environment.php b/tests/Support/EnvironmentTest.php
similarity index 94%
rename from tests/support/test-environment.php
rename to tests/Support/EnvironmentTest.php
index 1afb034f..04379194 100644
--- a/tests/support/test-environment.php
+++ b/tests/Support/EnvironmentTest.php
@@ -5,7 +5,7 @@
 use Mantle\Support\Environment;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Environment extends Framework_Test_Case {
+class EnvironmentTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		Environment::clear();
diff --git a/tests/support/test-forward-calls.php b/tests/Support/ForwardCallsTest.php
similarity index 98%
rename from tests/support/test-forward-calls.php
rename to tests/Support/ForwardCallsTest.php
index 8ff8d366..ee7d6094 100644
--- a/tests/support/test-forward-calls.php
+++ b/tests/Support/ForwardCallsTest.php
@@ -7,7 +7,7 @@
 use Mantle\Support\Forward_Calls;
 use PHPUnit\Framework\TestCase;
 
-class Forward_CallsTest extends TestCase {
+class ForwardCallsTest extends TestCase {
 
 	public function testForward_Calls() {
 		$results = ( new Forward_CallsOne() )->forwardedTwo( 'foo', 'bar' );
diff --git a/tests/support/test-pluralizer.php b/tests/Support/PluralizerTest.php
similarity index 99%
rename from tests/support/test-pluralizer.php
rename to tests/Support/PluralizerTest.php
index 78c6fbfa..787bb1b0 100755
--- a/tests/support/test-pluralizer.php
+++ b/tests/Support/PluralizerTest.php
@@ -5,7 +5,7 @@
 use Mantle\Support\Str;
 use PHPUnit\Framework\TestCase;
 
-class Test_Pluralizer extends TestCase {
+class PluralizerTest extends TestCase {
 
 	public function testBasicSingular() {
 		$this->assertSame( 'child', Str::singular( 'children' ) );
diff --git a/tests/support/providers/test-model-register-provider.php b/tests/Support/Providers/ModelRegisterProviderTest.php
similarity index 94%
rename from tests/support/providers/test-model-register-provider.php
rename to tests/Support/Providers/ModelRegisterProviderTest.php
index 1eb246bd..163be978 100644
--- a/tests/support/providers/test-model-register-provider.php
+++ b/tests/Support/Providers/ModelRegisterProviderTest.php
@@ -11,7 +11,7 @@
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class Test_Model_Service_Provider extends MockeryTestCase {
+class ModelRegisterProviderTest extends MockeryTestCase {
 	protected function setUp(): void {
 		parent::setUp();
 		remove_all_actions( 'init' );
diff --git a/tests/support/test-service-provider.php b/tests/Support/ServiceProviderTest.php
similarity index 99%
rename from tests/support/test-service-provider.php
rename to tests/Support/ServiceProviderTest.php
index 8b42d9c8..9b325be6 100644
--- a/tests/support/test-service-provider.php
+++ b/tests/Support/ServiceProviderTest.php
@@ -9,7 +9,7 @@
 use Mantle\Support\Attributes\Action;
 use Mockery as m;
 
-class Test_Service_Provider extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class ServiceProviderTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/support/test-str.php b/tests/Support/StrTest.php
similarity index 99%
rename from tests/support/test-str.php
rename to tests/Support/StrTest.php
index d0349f5b..2fd1b1d4 100644
--- a/tests/support/test-str.php
+++ b/tests/Support/StrTest.php
@@ -8,7 +8,7 @@
 use Ramsey\Uuid\UuidInterface;
 use ReflectionClass;
 
-class Test_Str extends TestCase {
+class StrTest extends TestCase {
 
 	public function testStringCanBeLimitedByWords() {
 		$this->assertSame( 'Taylor...', Str::words( 'Taylor Otwell', 1 ) );
diff --git a/tests/support/test-stringable.php b/tests/Support/StringableTest.php
similarity index 99%
rename from tests/support/test-stringable.php
rename to tests/Support/StringableTest.php
index e50565c1..98e9c4e2 100644
--- a/tests/support/test-stringable.php
+++ b/tests/Support/StringableTest.php
@@ -8,7 +8,7 @@
 use Mantle\Support\Stringable;
 use PHPUnit\Framework\TestCase;
 
-class Test_Stringable extends TestCase {
+class StringableTest extends TestCase {
 
 	/**
 	 * @param  string $string
diff --git a/tests/testing/concerns/test-block-assertions.php b/tests/Testing/Concerns/BlockAssertionsTest.php
similarity index 95%
rename from tests/testing/concerns/test-block-assertions.php
rename to tests/Testing/Concerns/BlockAssertionsTest.php
index 97a8805a..dbd157a3 100644
--- a/tests/testing/concerns/test-block-assertions.php
+++ b/tests/Testing/Concerns/BlockAssertionsTest.php
@@ -8,7 +8,7 @@
 /**
  * @group testing
  */
-class Test_Block_Assertions extends Framework_Test_Case {
+class BlockAssertionsTest extends Framework_Test_Case {
 	use With_Faker;
 
 	protected WP_Post $post;
diff --git a/tests/testing/concerns/test-deprecations.php b/tests/Testing/Concerns/DeprecationsTest.php
similarity index 96%
rename from tests/testing/concerns/test-deprecations.php
rename to tests/Testing/Concerns/DeprecationsTest.php
index 44298b51..fc09d842 100644
--- a/tests/testing/concerns/test-deprecations.php
+++ b/tests/Testing/Concerns/DeprecationsTest.php
@@ -8,7 +8,7 @@
  *
  * @group testing
  */
-class Test_Deprecations extends Framework_Test_Case {
+class DeprecationsTest extends Framework_Test_Case {
 	/**
 	 * @expectedDeprecated test_deprecation_annotation
 	 */
diff --git a/tests/testing/concerns/test-element-assertions.php b/tests/Testing/Concerns/ElementAssertionsTest.php
similarity index 96%
rename from tests/testing/concerns/test-element-assertions.php
rename to tests/Testing/Concerns/ElementAssertionsTest.php
index deda4c49..4c55dedb 100644
--- a/tests/testing/concerns/test-element-assertions.php
+++ b/tests/Testing/Concerns/ElementAssertionsTest.php
@@ -7,7 +7,7 @@
 /**
  * @group testing
  */
-class Test_Element_Assertions extends Framework_Test_Case {
+class ElementAssertionsTest extends Framework_Test_Case {
 	public string $test_content = '
 	<div>
 		<section>Example Section</section>
diff --git a/tests/testing/concerns/test-incorrect-usage.php b/tests/Testing/Concerns/IncorrectUsageTest.php
similarity index 96%
rename from tests/testing/concerns/test-incorrect-usage.php
rename to tests/Testing/Concerns/IncorrectUsageTest.php
index 214f7821..156701de 100644
--- a/tests/testing/concerns/test-incorrect-usage.php
+++ b/tests/Testing/Concerns/IncorrectUsageTest.php
@@ -8,7 +8,7 @@
  *
  * @group testing
  */
-class Test_Incorrect_Usage extends Framework_Test_Case {
+class IncorrectUsageTest extends Framework_Test_Case {
 	/**
 	 * @expectedIncorrectUsage test_incorrect_usage_annotation
 	 */
diff --git a/tests/testing/concerns/test-interacts-with-console.php b/tests/Testing/Concerns/InteractsWithConsoleTest.php
similarity index 93%
rename from tests/testing/concerns/test-interacts-with-console.php
rename to tests/Testing/Concerns/InteractsWithConsoleTest.php
index f1d8061d..d19a1796 100644
--- a/tests/testing/concerns/test-interacts-with-console.php
+++ b/tests/Testing/Concerns/InteractsWithConsoleTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Mantle\Testing\Concerns;
+namespace Mantle\Tests\Concerns;
 
 use Mantle\Facade\Console;
 use Mantle\Testing\Framework_Test_Case;
@@ -7,7 +7,7 @@
 /**
  * @group testing
  */
-class Test_Interacts_With_Console extends Framework_Test_Case {
+class InteractsWithConsoleTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/testing/concerns/test-interacts-with-external-requests.php b/tests/Testing/Concerns/InteractsWithExternalRequestsTest.php
similarity index 99%
rename from tests/testing/concerns/test-interacts-with-external-requests.php
rename to tests/Testing/Concerns/InteractsWithExternalRequestsTest.php
index fb655fc7..44b4863d 100644
--- a/tests/testing/concerns/test-interacts-with-external-requests.php
+++ b/tests/Testing/Concerns/InteractsWithExternalRequestsTest.php
@@ -17,7 +17,7 @@
  *
  * @group testing
  */
-class Test_Interacts_With_External_Requests extends Framework_Test_Case {
+class InteractsWithExternalRequestsTest extends Framework_Test_Case {
 	use Prevent_Remote_Requests;
 
 	public function test_fake_request() {
diff --git a/tests/testing/concerns/test-interacts-with-hooks.php b/tests/Testing/Concerns/InteractsWithHooksTest.php
similarity index 98%
rename from tests/testing/concerns/test-interacts-with-hooks.php
rename to tests/Testing/Concerns/InteractsWithHooksTest.php
index 2447a3fc..bdf435cd 100644
--- a/tests/testing/concerns/test-interacts-with-hooks.php
+++ b/tests/Testing/Concerns/InteractsWithHooksTest.php
@@ -6,7 +6,7 @@
 /**
  * @group testing
  */
-class Test_Interacts_With_Hooks extends Framework_Test_Case {
+class InteractsWithHooksTest extends Framework_Test_Case {
 	public function test_hook_applied() {
 		$this->assertHookNotApplied( 'hook_to_check' );
 		$this->assertHookNotApplied( 'filter_to_check' );
diff --git a/tests/testing/concerns/test-makes-http-requests.php b/tests/Testing/Concerns/MakesHttpRequestsTest.php
similarity index 99%
rename from tests/testing/concerns/test-makes-http-requests.php
rename to tests/Testing/Concerns/MakesHttpRequestsTest.php
index 1afd1fc4..5dc1b83e 100644
--- a/tests/testing/concerns/test-makes-http-requests.php
+++ b/tests/Testing/Concerns/MakesHttpRequestsTest.php
@@ -17,7 +17,7 @@
 /**
  * @group testing
  */
-class Test_Makes_Http_Requests extends Framework_Test_Case {
+class MakesHttpRequestsTest extends Framework_Test_Case {
 	use Refresh_Database;
 
 	public function test_get_home() {
diff --git a/tests/testing/concerns/test-wordpress-authentication.php b/tests/Testing/Concerns/WordPressAuthenticationTest.php
similarity index 90%
rename from tests/testing/concerns/test-wordpress-authentication.php
rename to tests/Testing/Concerns/WordPressAuthenticationTest.php
index 1db897a3..252035ec 100644
--- a/tests/testing/concerns/test-wordpress-authentication.php
+++ b/tests/Testing/Concerns/WordPressAuthenticationTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace Mantle\Testing\Concerns;
+namespace Mantle\Tests\Concerns;
 
 use Mantle\Console\Command;
 use Mantle\Facade\Console;
@@ -8,7 +8,7 @@
 /**
  * @group testing
  */
-class Test_WordPress_Authentication extends Framework_Test_Case {
+class WordPressAuthenticationTest extends Framework_Test_Case {
 	public function test_acting_as_role() {
 		$user = $this->acting_as( 'administrator' );
 
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot__1.yml b/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot__1.yml
similarity index 100%
rename from tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot__1.yml
rename to tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot__1.yml
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html b/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http__1.html
similarity index 100%
rename from tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html
rename to tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http__1.html
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html b/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http_partial__1.html
similarity index 100%
rename from tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html
rename to tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http_partial__1.html
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__1.json b/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__1.json
similarity index 100%
rename from tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__1.json
rename to tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__1.json
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__2.json b/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__2.json
similarity index 100%
rename from tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__2.json
rename to tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__2.json
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__3.json b/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__3.json
similarity index 100%
rename from tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__3.json
rename to tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__3.json
diff --git a/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_multiple_requests__1.yml b/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_multiple_requests__1.yml
similarity index 100%
rename from tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_multiple_requests__1.yml
rename to tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_multiple_requests__1.yml
diff --git a/tests/testing/test-core-test-shim.php b/tests/Testing/CoreTestShimTest.php
similarity index 88%
rename from tests/testing/test-core-test-shim.php
rename to tests/Testing/CoreTestShimTest.php
index d5f00950..f88ffe97 100644
--- a/tests/testing/test-core-test-shim.php
+++ b/tests/Testing/CoreTestShimTest.php
@@ -3,7 +3,7 @@
 
 use WP_UnitTestCase;
 
-class Test_Core_Test_Shim extends WP_UnitTestCase {
+class CoreTestShimTest extends WP_UnitTestCase {
 	protected $setup_called = false;
 
 	public function set_up() {
diff --git a/tests/testing/test-permalink-structure.php b/tests/Testing/PermalinkStructureTest.php
similarity index 97%
rename from tests/testing/test-permalink-structure.php
rename to tests/Testing/PermalinkStructureTest.php
index 0d7e114f..71306135 100644
--- a/tests/testing/test-permalink-structure.php
+++ b/tests/Testing/PermalinkStructureTest.php
@@ -4,7 +4,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class Test_Permalink_Structure extends Framework_Test_Case {
+class PermalinkStructureTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/testing/test-with-faker.php b/tests/Testing/WithFakerTest.php
similarity index 62%
rename from tests/testing/test-with-faker.php
rename to tests/Testing/WithFakerTest.php
index f08f97d6..8b950906 100644
--- a/tests/testing/test-with-faker.php
+++ b/tests/Testing/WithFakerTest.php
@@ -1,10 +1,11 @@
 <?php
-namespace Mantle\Testing;
+namespace Mantle\Tests;
 
 use Faker\Generator;
 use Mantle\Testing\Concerns\With_Faker;
+use Mantle\Testing\Framework_Test_Case;
 
-class Test_With_Faker extends Framework_Test_Case {
+class WithFakerTest extends Framework_Test_Case {
 	use With_Faker;
 
 	public function test_creates_faker() {
diff --git a/tests/testkit/concerns/trait-example-overload.php b/tests/Testkit/Concerns/ExampleOverload.php
similarity index 83%
rename from tests/testkit/concerns/trait-example-overload.php
rename to tests/Testkit/Concerns/ExampleOverload.php
index 25f914d3..ac79ce02 100644
--- a/tests/testkit/concerns/trait-example-overload.php
+++ b/tests/Testkit/Concerns/ExampleOverload.php
@@ -10,7 +10,7 @@
 /**
  * Validates that method overloading is working as expected.
  */
-trait Example_Overload {
+trait ExampleOverload {
 
 	/**
 	 * @var array<string> Contains the names of the methods that have been overloaded.
@@ -21,7 +21,7 @@ trait Example_Overload {
 	 * This method should be run during the setUpBeforeClass method of
 	 * the Test_Case.
 	 */
-	public static function example_overload_set_up_before_class(): void {
+	public static function exampleoverload_set_up_before_class(): void {
 		static::$overloaded_methods[] = 'setUpBeforeClass';
 	}
 }
diff --git a/tests/testkit/test-testkit-install-wordpress.php b/tests/Testkit/TestkitInstallWordPressTest.php
similarity index 92%
rename from tests/testkit/test-testkit-install-wordpress.php
rename to tests/Testkit/TestkitInstallWordPressTest.php
index 80bdf940..0177366a 100644
--- a/tests/testkit/test-testkit-install-wordpress.php
+++ b/tests/Testkit/TestkitInstallWordPressTest.php
@@ -14,7 +14,7 @@
 	$_SERVER['__mantle_after_wordpress_install']++;
 } );
 
-class Test_Testkit_Install_WordPress extends Test_Case {
+class TestkitInstallWordPressTest extends Test_Case {
 	use Installs_WordPress;
 
 	public function test_mantle_is_installed_from_trait() {
diff --git a/tests/testkit/test-testkit-test-case.php b/tests/Testkit/TestkitTestCaseTest.php
similarity index 87%
rename from tests/testkit/test-testkit-test-case.php
rename to tests/Testkit/TestkitTestCaseTest.php
index 25d71d86..895181be 100644
--- a/tests/testkit/test-testkit-test-case.php
+++ b/tests/Testkit/TestkitTestCaseTest.php
@@ -1,11 +1,11 @@
 <?php
 namespace Mantle\Tests\Testkit;
 
-use Mantle\Tests\Testkit\Concerns\Example_Overload;
+use Mantle\Tests\Testkit\Concerns\ExampleOverload;
 use Mantle\Testkit\Test_Case;
 
-class Test_Testkit_Test_Case extends Test_Case {
-	use Example_Overload;
+class TestkitTestCaseTest extends Test_Case {
+	use ExampleOverload;
 
 	public function test_create_application() {
 		$this->assertInstanceOf( \Mantle\Contracts\Application::class, $this->create_application() );
diff --git a/tests/testkit/test-with-faker.php b/tests/Testkit/WithFakerTest.php
similarity index 85%
rename from tests/testkit/test-with-faker.php
rename to tests/Testkit/WithFakerTest.php
index 12ec2efb..05bc615e 100644
--- a/tests/testkit/test-with-faker.php
+++ b/tests/Testkit/WithFakerTest.php
@@ -5,7 +5,7 @@
 use Mantle\Testing\Concerns\With_Faker;
 use Mantle\Testkit\Test_Case;
 
-class Test_With_Faker extends Test_Case {
+class WithFakerTest extends Test_Case {
 	use With_Faker;
 
 	public function test_creates_faker() {
diff --git a/tests/testkit/fixtures/global-functions.php b/tests/Testkit/fixtures/global-functions.php
similarity index 100%
rename from tests/testkit/fixtures/global-functions.php
rename to tests/Testkit/fixtures/global-functions.php
diff --git a/tests/view/test-blade-views.php b/tests/View/BladeViewsTest.php
similarity index 93%
rename from tests/view/test-blade-views.php
rename to tests/View/BladeViewsTest.php
index 7794fdca..9334711f 100644
--- a/tests/view/test-blade-views.php
+++ b/tests/View/BladeViewsTest.php
@@ -3,7 +3,7 @@
 
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_Blade_Views extends Framework_Test_Case {
+class BladeViewsTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/view/test-file-engine.php b/tests/View/FileEngineTest.php
similarity index 91%
rename from tests/view/test-file-engine.php
rename to tests/View/FileEngineTest.php
index 1eb2b43e..e5b02393 100644
--- a/tests/view/test-file-engine.php
+++ b/tests/View/FileEngineTest.php
@@ -3,7 +3,7 @@
 
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_File_Views extends Framework_Test_Case {
+class FileEngineTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/view/test-php-views.php b/tests/View/PhpViewsTest.php
similarity index 99%
rename from tests/view/test-php-views.php
rename to tests/View/PhpViewsTest.php
index 985855e2..9ee68f04 100644
--- a/tests/view/test-php-views.php
+++ b/tests/View/PhpViewsTest.php
@@ -5,7 +5,7 @@
 use Mantle\Facade\View;
 use Mantle\Http\View\Factory;
 
-class Test_Php_Views extends Framework_Test_Case {
+class PhpViewsTest extends Framework_Test_Case {
 	protected Factory $view_factory;
 
 	protected function setUp(): void {
diff --git a/tests/view/test-view-finder.php b/tests/View/ViewFinderTest.php
similarity index 96%
rename from tests/view/test-view-finder.php
rename to tests/View/ViewFinderTest.php
index e9b98954..655b0671 100644
--- a/tests/view/test-view-finder.php
+++ b/tests/View/ViewFinderTest.php
@@ -4,7 +4,7 @@
 use Mantle\Facade\View_Loader;
 use Mantle\Testing\Framework_Test_Case;
 
-class Test_View_Finder extends Framework_Test_Case {
+class ViewFinderTest extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/framework/blocks/fixtures/blocks/class-mock-block.php b/tests/framework/blocks/fixtures/blocks/class-mock-block.php
deleted file mode 100644
index eaac44be..00000000
--- a/tests/framework/blocks/fixtures/blocks/class-mock-block.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * An Example block class
- * @package Mantle
- * @subpackage Tests
- */
-
-namespace Mantle\Tests\Framework\Blocks\Fixtures\Blocks;
-
-use Mantle\Contracts\Block;
-
-class Mock_Block implements Block {
-	/**
-	 * Number of times this block has been registered.
-	 */
-	public static int $registrations = 0;
-
-	public function register(): void {
-		self::$registrations++;
-	}
-}
diff --git a/tests/framework/blocks/fixtures/dummy/class-example-block.php b/tests/framework/blocks/fixtures/dummy/class-example-block.php
deleted file mode 100644
index 08faf28b..00000000
--- a/tests/framework/blocks/fixtures/dummy/class-example-block.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * An Example block class
- * @package Mantle
- * @subpackage Tests
- */
-
-namespace Mantle\Tests\Framework\Blocks\Fixtures\Dummy;
-
-use Mantle\Contracts\Block;
-
-class Example_Block implements Block {
-	public function register(): void {
-
-	}
-}
diff --git a/tests/framework/blocks/test-block-provider.php b/tests/framework/blocks/test-block-provider.php
deleted file mode 100644
index 72927f28..00000000
--- a/tests/framework/blocks/test-block-provider.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-namespace Mantle\Tests\Framework\Tests;
-
-use Mantle\Application\Application;
-use Mantle\Blocks\Discover_Blocks;
-use Mantle\Blocks\Block_Service_Provider;
-use Mantle\Support\Environment;
-use Mantle\Testing\Framework_Test_Case;
-use Mantle\Tests\Framework\Blocks\Fixtures\Blocks\Mock_Block;
-use Mantle\Tests\Framework\Blocks\Fixtures\Dummy\Example_Block;
-use Mockery as m;
-
-class Test_Block_Provider extends Framework_Test_Case {
-	protected function setUp(): void {
-		parent::setUp();
-
-		// Mock a true Mantle application.
-		$this->app->set_app_path( dirname( __DIR__, 2 ) );
-
-		$this->app['config']->set( 'app.namespace', 'Mantle\\Tests' );
-	}
-
-	protected function tearDown(): void {
-		$this->app['config']->set( 'app.namespace', 'App' );
-		$this->app->set_app_path( $this->app->get_base_path( 'app' ) );
-
-		parent::tearDown();
-	}
-
-	/**
-	 * Verify that the Discover_Blocks::within method returns the expected
-	 * array of block class names.
-	 */
-	public function testBlocksAreFound() {
-		$this->assertEquals( 'Mantle\\Tests', $this->app->get_namespace() );
-
-		$expected = [
-			Example_Block::class,
-		];
-
-		$found_blocks = Discover_Blocks::within(
-			__DIR__ . '/fixtures/dummy',
-			getcwd(),
-		);
-
-		$this->assertSame( $expected, $found_blocks );
-	}
-
-	/**
-	 * Verify that the Block Service Provider locates, and registers, blocks
-	 * as expected.
-	 */
-	public function testBlockProviderRegistersBlocks() {
-		$expected = 1;
-
-		/**
-		 * First we need to configure the test application so it will find the blocks
-		 * inside of our fixtures folder, and load them as if this were the Mantle app.
-		 */
-		$app = m::mock( Application::class )->makePartial();
-		$app->set_base_path( getcwd() );
-		$app->set_app_path( __DIR__ . '/fixtures' );
-
-		$app['config'] = $this->app['config'];
-
-		$this->assertEquals( 'Mantle\\Tests', $app->get_namespace() );
-
-		/**
-		 * Now we need to boot our test application.
-		 */
-		$app->register( Block_Service_Provider::class );
-		$app->boot();
-
-		$this->assertSame( $expected, Mock_Block::$registrations );
-	}
-}
diff --git a/tests/framework/helpers/test-nullable-site-objects-test-case.php b/tests/framework/helpers/test-nullable-site-objects-test-case.php
deleted file mode 100644
index 7f805d5e..00000000
--- a/tests/framework/helpers/test-nullable-site-objects-test-case.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Class file for Nullable_Site_Objects_Test_Case
- *
- * @package Mantle
- */
-
-namespace Mantle\Tests\Framework\Helpers;
-
-use Mantle\Testing\Framework_Test_Case;
-use function Mantle\Support\Helpers\get_site_object;
-
-if ( \is_multisite() ) {
-	/**
-	 * Unit tests for nullable site object functions.
-	 */
-	class Nullable_Site_Objects_Test_Case extends Framework_Test_Case {
-		/**
-		 * Test that `get_site_object()` returns a site object.
-		 */
-		public function test_site_object_returns_site() {
-			$known_id = self::factory()->blog->create();
-
-			$found_object = get_site_object( $known_id );
-
-			$this->assertInstanceOf( \WP_Site::class, $found_object );
-
-			$this->assertSame( $known_id, (int) $found_object->blog_id );
-		}
-
-		/**
-		 * Test that `get_site_object()` returns null when there is no site.
-		 */
-		public function test_site_object_returns_null() {
-			$found_object = get_site_object( -99 );
-
-			$this->assertNull( $found_object );
-		}
-	}
-}

From d937cc467fcb3daa0b25fb80fe8bcd7decbc4699 Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Tue, 21 Nov 2023 12:53:41 -0500
Subject: [PATCH 29/32] CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7bd8b72..f0266a5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.12.8 - 2023-11-21
+
+### Changed
+
+- Added PHPUnit 10 support.
+
 ## v0.12.8 - 2023-11-14
 
 ### Added

From 527871ed46edd5a510427973037dd00544849ac7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Nov 2023 12:56:50 -0500
Subject: [PATCH 30/32] Update phpstan/phpstan requirement from 1.10.41 to
 1.10.43 (#474)

Updates the requirements on [phpstan/phpstan](https://github.com/phpstan/phpstan) to permit the latest version.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.41...1.10.43)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e088cc7e..31940680 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "mockery/mockery": "^1.6.6",
         "php-stubs/wp-cli-stubs": "^2.8",
         "phpstan/phpdoc-parser": "^1.23.1",
-        "phpstan/phpstan": "1.10.41",
+        "phpstan/phpstan": "1.10.43",
         "phpunit/phpunit": "^9.3.3 || ^10.0.7",
         "predis/predis": "^2.2.0",
         "squizlabs/php_codesniffer": "^3.7",

From 2bf5699ea54e9eb8e115dfdcc6a000bbf58fce08 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 10:52:15 -0500
Subject: [PATCH 31/32] Update phpstan/phpstan requirement from 1.10.43 to
 1.10.44 (#476)

Updates the requirements on [phpstan/phpstan](https://github.com/phpstan/phpstan) to permit the latest version.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.43...1.10.44)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 31940680..714474f4 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
         "mockery/mockery": "^1.6.6",
         "php-stubs/wp-cli-stubs": "^2.8",
         "phpstan/phpdoc-parser": "^1.23.1",
-        "phpstan/phpstan": "1.10.43",
+        "phpstan/phpstan": "1.10.44",
         "phpunit/phpunit": "^9.3.3 || ^10.0.7",
         "predis/predis": "^2.2.0",
         "squizlabs/php_codesniffer": "^3.7",

From 9b6517e660289e43074cf72329424b9e0395d16b Mon Sep 17 00:00:00 2001
From: Sean Fisher <srtfisher@gmail.com>
Date: Mon, 27 Nov 2023 16:12:56 -0500
Subject: [PATCH 32/32] Revert "Support PHPUnit 10" from 0.12.x (#475)

* Revert "Support PHPUnit 10 (#427)"

This reverts commit 9ba62e1b21546d75dc8a03556046ad193f1ad1c7.

* Fixing unit tests for wordpress 6.4

* CHANGELOG
---
 .gitignore                                    |   3 +-
 CHANGELOG.md                                  |   6 +
 bin/convert-psr4-dir.php                      |  49 -----
 bin/convert-psr4-file.php                     | 132 --------------
 composer.json                                 |  21 +--
 monorepo-builder.php                          |   2 +-
 phpunit.xml                                   |  23 +--
 src/mantle/assets/composer.json               |   2 +-
 src/mantle/support/class-stringable.php       |   9 -
 src/mantle/testing/class-assert.php           |  54 ++++++
 .../testing/concerns/trait-deprecations.php   |  12 +-
 .../concerns/trait-incorrect-usage.php        |  13 +-
 .../concerns/trait-reads-annotations.php      |  57 ------
 src/mantle/testkit/composer.json              |   6 +-
 tests/Assets/AssetManagerTest.php             | 107 -----------
 .../NullableSiteObjectsTestCaseTest.php       |  46 -----
 .../class-test-case.php}                      |   3 +-
 .../test-asset-loader.php}                    |   2 +-
 tests/assets/test-asset-manager.php           | 108 +++++++++++
 .../test-cache-manager.php}                   |   2 +-
 .../test-repository.php}                      |   2 +-
 .../generators/test-printer.php}              |   2 +-
 .../hook-usage/base-example.php               |   0
 .../hook-usage/sub/sub-example.php            |   0
 .../test-command.php}                         |   2 +-
 .../test-generator-command.php}               |   2 +-
 .../test-hook-usage-command.php}              |   2 +-
 .../test-parser.php}                          |   2 +-
 tests/{Console => console}/test.stub          |   0
 .../test-container-call.php}                  |   4 +-
 .../test-container.php}                       |   4 +-
 .../factory/test-factory.php}                 |   2 +-
 .../factory/test-unit-testing-factory.php}    |   2 +-
 .../registration/test-register-meta.php}      |   2 +-
 .../registration/test-register-post-type.php} |   2 +-
 .../registration/test-register-taxonomy.php}  |   2 +-
 .../test-belongs-to-one-or-many.php}          |   2 +-
 .../model/relations/test-has-one-or-many.php} |   2 +-
 .../model/test-attachment.php}                |   2 +-
 .../model/test-comment-object.php}            |   2 +-
 .../model/test-model-scope.php}               |   2 +-
 .../model/test-model.php}                     |   2 +-
 .../model/test-permalink-generator.php}       |   2 +-
 .../model/test-post-model-events.php}         |   2 +-
 .../model/test-post-object.php}               |   2 +-
 .../model/test-rest-field.php}                |   2 +-
 .../model/test-site-object.php}               |   2 +-
 .../model/test-term-model-events.php}         |   2 +-
 .../model/test-term-object.php}               |   2 +-
 .../model/test-user-object.php}               |   2 +-
 .../query/test-eager-load-relationships.php}  |   2 +-
 .../query/test-paginator.php}                 |   2 +-
 .../query/test-post-query-builder.php}        |   2 +-
 .../query/test-post-query-relationships.php}  |   2 +-
 .../query/test-term-query-builder.php}        |   2 +-
 .../test-event-dispatcher.php}                |   2 +-
 .../test-wordpress-action-dispatcher.php}     |   2 +-
 .../test-filesystem-adapter.php}              |   6 +-
 .../test-filesystem-manager.php}              |   2 +-
 .../test-filesystem.php}                      | 168 +++++++++---------
 .../fixtures/blocks/class-mock-block.php      |  21 +++
 .../fixtures/dummy/class-example-block.php    |  16 ++
 .../framework/blocks/test-block-provider.php  |  76 ++++++++
 .../fixtures/events/class-event-one.php       |   0
 .../fixtures/events/class-event-two.php       |   0
 .../listeners/class-example-listener.php      |   0
 .../events/test-discover-events.php}          |   6 +-
 ...st-nullable-comment-objects-test-case.php} |   2 +-
 .../test-nullable-post-objects-test-case.php} |   2 +-
 .../test-nullable-site-objects-test-case.php  |  40 +++++
 .../test-nullable-term-objects-test-case.php} |   2 +-
 .../test-nullable-user-objects-test-case.php} |   2 +-
 .../test-alias-loader.php}                    |   2 +-
 .../test-application.php}                     |   2 +-
 .../test-bootloader.php}                      |   2 +-
 .../test-isolated-framework.php}              |   2 +-
 .../test-pipeline.php}                        |   0
 .../test-helpers-array.php}                   |   2 +-
 .../test-helpers-general.php}                 |   4 +-
 .../test-helpers.php}                         |   2 +-
 .../test-http-client.php}                     |   2 +-
 .../routing/test-post-model-routing.php}      |   2 +-
 .../routing/test-rest-api-routing.php}        |   2 +-
 .../routing/test-term-model-routing.php}      |   2 +-
 .../test-controller.php}                      |   2 +-
 .../test-redirector.php}                      |   2 +-
 .../test-response-factory.php}                |   2 +-
 .../RouterTest.php => http/test-router.php}   |   2 +-
 .../test-uploaded-file.php}                   |   2 +-
 .../test-url-generator.php}                   |   2 +-
 .../test-log-manager.php}                     |   2 +-
 .../providers/test-wordpress-cron-queue.php}  |   2 +-
 .../test-dispatcher.php}                      |   2 +-
 .../test-queue-manager.php}                   |   2 +-
 .../WorkerTest.php => queue/test-worker.php}  |   2 +-
 .../test-event.php}                           |   2 +-
 .../test-frequency.php}                       |   2 +-
 .../test-model-register-provider.php}         |   2 +-
 .../ArrTest.php => support/test-arr.php}      |   2 +-
 .../test-collection.php}                      |   8 +-
 .../test-environment.php}                     |   2 +-
 .../test-forward-calls.php}                   |   2 +-
 .../test-pluralizer.php}                      |   2 +-
 .../test-service-provider.php}                |   2 +-
 .../StrTest.php => support/test-str.php}      |   2 +-
 .../test-stringable.php}                      |   2 +-
 tests/{FakerTest.php => test-faker.php}       |   2 +-
 ...Http_Requests__test_match_snapshot__1.yml} |   0
 ...equests__test_match_snapshot_http__1.html} |   0
 ..._test_match_snapshot_http_partial__1.html} |   0
 ...equests__test_match_snapshot_rest__1.json} |   0
 ...equests__test_match_snapshot_rest__2.json} |   0
 ...equests__test_match_snapshot_rest__3.json} |   0
 ...p_Requests__test_multiple_requests__1.yml} |   0
 .../concerns/test-block-assertions.php}       |   2 +-
 .../concerns/test-deprecations.php}           |   2 +-
 .../concerns/test-element-assertions.php}     |   2 +-
 .../concerns/test-incorrect-usage.php}        |   2 +-
 .../concerns/test-interacts-with-console.php} |   4 +-
 ...test-interacts-with-external-requests.php} |   2 +-
 .../concerns/test-interacts-with-hooks.php}   |   2 +-
 .../concerns/test-makes-http-requests.php}    |   2 +-
 .../test-wordpress-authentication.php}        |   4 +-
 .../test-core-test-shim.php}                  |   2 +-
 .../test-permalink-structure.php}             |   2 +-
 .../test-with-faker.php}                      |   5 +-
 .../concerns/trait-example-overload.php}      |   4 +-
 .../fixtures/global-functions.php             |   0
 .../test-testkit-install-wordpress.php}       |   2 +-
 .../test-testkit-test-case.php}               |   6 +-
 .../test-with-faker.php}                      |   2 +-
 .../test-blade-views.php}                     |   2 +-
 .../test-file-engine.php}                     |   2 +-
 .../test-php-views.php}                       |   2 +-
 .../test-view-finder.php}                     |   2 +-
 135 files changed, 564 insertions(+), 637 deletions(-)
 delete mode 100644 bin/convert-psr4-dir.php
 delete mode 100644 bin/convert-psr4-file.php
 create mode 100644 src/mantle/testing/class-assert.php
 delete mode 100644 src/mantle/testing/concerns/trait-reads-annotations.php
 delete mode 100644 tests/Assets/AssetManagerTest.php
 delete mode 100644 tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php
 rename tests/{Assets/TestCase.php => assets/class-test-case.php} (95%)
 rename tests/{Assets/AssetLoaderTest.php => assets/test-asset-loader.php} (98%)
 create mode 100644 tests/assets/test-asset-manager.php
 rename tests/{Cache/CacheManagerTest.php => cache/test-cache-manager.php} (97%)
 rename tests/{Config/RepositoryTest.php => config/test-repository.php} (97%)
 rename tests/{Console/generators/PrinterTest.php => console/generators/test-printer.php} (98%)
 rename tests/{Console => console}/hook-usage/base-example.php (100%)
 rename tests/{Console => console}/hook-usage/sub/sub-example.php (100%)
 rename tests/{Console/CommandTest.php => console/test-command.php} (98%)
 rename tests/{Console/GeneratorCommandTest.php => console/test-generator-command.php} (98%)
 rename tests/{Console/HookUsageCommandTest.php.bak => console/test-hook-usage-command.php} (96%)
 rename tests/{Console/ParserTest.php => console/test-parser.php} (99%)
 rename tests/{Console => console}/test.stub (100%)
 rename tests/{Container/ContainerCallTest.php => container/test-container-call.php} (99%)
 rename tests/{Container/ContainerTest.php => container/test-container.php} (99%)
 rename tests/{Database/Factory/FactoryTest.php => database/factory/test-factory.php} (99%)
 rename tests/{Database/Factory/UnitTestingFactoryTest.php => database/factory/test-unit-testing-factory.php} (99%)
 rename tests/{Database/Model/registration/RegisterMetaTest.php => database/model/registration/test-register-meta.php} (95%)
 rename tests/{Database/Model/registration/RegisterPostTypeTest.php => database/model/registration/test-register-post-type.php} (98%)
 rename tests/{Database/Model/registration/RegisterTaxonomyTest.php => database/model/registration/test-register-taxonomy.php} (96%)
 rename tests/{Database/Model/relations/BelongsToOneOrManyTest.php => database/model/relations/test-belongs-to-one-or-many.php} (98%)
 rename tests/{Database/Model/relations/HasOneOrManyTest.php => database/model/relations/test-has-one-or-many.php} (99%)
 rename tests/{Database/Model/AttachmentTest.php => database/model/test-attachment.php} (93%)
 rename tests/{Database/Model/CommentObjectTest.php => database/model/test-comment-object.php} (97%)
 rename tests/{Database/Model/ModelScopeTest.php => database/model/test-model-scope.php} (98%)
 rename tests/{Database/Model/ModelTest.php => database/model/test-model.php} (99%)
 rename tests/{Database/Model/PermalinkGeneratorTest.php => database/model/test-permalink-generator.php} (94%)
 rename tests/{Database/Model/PostModelEventsTest.php => database/model/test-post-model-events.php} (98%)
 rename tests/{Database/Model/PostObjectTest.php => database/model/test-post-object.php} (99%)
 rename tests/{Database/Model/RestFieldTest.php => database/model/test-rest-field.php} (93%)
 rename tests/{Database/Model/SiteObjectTest.php => database/model/test-site-object.php} (94%)
 rename tests/{Database/Model/TermModelEventsTest.php => database/model/test-term-model-events.php} (98%)
 rename tests/{Database/Model/TermObjectTest.php => database/model/test-term-object.php} (98%)
 rename tests/{Database/Model/UserObjectTest.php => database/model/test-user-object.php} (97%)
 rename tests/{Database/Query/EagerLoadRelationshipsTest.php => database/query/test-eager-load-relationships.php} (99%)
 rename tests/{Database/Query/PaginatorTest.php => database/query/test-paginator.php} (99%)
 rename tests/{Database/Query/PostQueryBuilderTest.php => database/query/test-post-query-builder.php} (99%)
 rename tests/{Database/Query/PostQueryRelationshipsTest.php => database/query/test-post-query-relationships.php} (97%)
 rename tests/{Database/Query/TermQueryBuilderTest.php => database/query/test-term-query-builder.php} (98%)
 rename tests/{Events/EventDispatcherTest.php => events/test-event-dispatcher.php} (97%)
 rename tests/{Events/WordPressActionDispatcherTest.php => events/test-wordpress-action-dispatcher.php} (98%)
 rename tests/{Filesystem/FilesystemAdapterTest.php => filesystem/test-filesystem-adapter.php} (98%)
 rename tests/{Filesystem/FilesystemManagerTest.php => filesystem/test-filesystem-manager.php} (97%)
 rename tests/{Filesystem/FilesystemTest.php => filesystem/test-filesystem.php} (67%)
 create mode 100644 tests/framework/blocks/fixtures/blocks/class-mock-block.php
 create mode 100644 tests/framework/blocks/fixtures/dummy/class-example-block.php
 create mode 100644 tests/framework/blocks/test-block-provider.php
 rename tests/{Framework/Events => framework/events}/fixtures/events/class-event-one.php (100%)
 rename tests/{Framework/Events => framework/events}/fixtures/events/class-event-two.php (100%)
 rename tests/{Framework/Events => framework/events}/fixtures/listeners/class-example-listener.php (100%)
 rename tests/{Framework/Events/DiscoverEventsTest.php => framework/events/test-discover-events.php} (88%)
 rename tests/{Framework/Helpers/NullableCommentObjectsTestCaseTest.php => framework/helpers/test-nullable-comment-objects-test-case.php} (93%)
 rename tests/{Framework/Helpers/NullablePostObjectsTestCaseTest.php => framework/helpers/test-nullable-post-objects-test-case.php} (95%)
 create mode 100644 tests/framework/helpers/test-nullable-site-objects-test-case.php
 rename tests/{Framework/Helpers/NullableTermObjectsTestCaseTest.php => framework/helpers/test-nullable-term-objects-test-case.php} (98%)
 rename tests/{Framework/Helpers/NullableUserObjectsTestCaseTest.php => framework/helpers/test-nullable-user-objects-test-case.php} (95%)
 rename tests/{Framework/AliasLoaderTest.php => framework/test-alias-loader.php} (97%)
 rename tests/{Framework/ApplicationTest.php => framework/test-application.php} (98%)
 rename tests/{Framework/BootloaderTest.php => framework/test-bootloader.php} (98%)
 rename tests/{Framework/IsolatedFrameworkTest.php => framework/test-isolated-framework.php} (95%)
 rename tests/{Framework/PipelineTest.php => framework/test-pipeline.php} (100%)
 rename tests/{Helpers/HelpersArrayTest.php => helpers/test-helpers-array.php} (99%)
 rename tests/{Helpers/HelpersGeneralTest.php => helpers/test-helpers-general.php} (98%)
 rename tests/{Helpers/HelpersTest.php => helpers/test-helpers.php} (98%)
 rename tests/{HttpClient/HttpClientTest.php => http-client/test-http-client.php} (99%)
 rename tests/{Http/Routing/PostModelRoutingTest.php => http/routing/test-post-model-routing.php} (97%)
 rename tests/{Http/Routing/RestApiRoutingTest.php => http/routing/test-rest-api-routing.php} (98%)
 rename tests/{Http/Routing/TermModelRoutingTest.php => http/routing/test-term-model-routing.php} (98%)
 rename tests/{Http/ControllerTest.php => http/test-controller.php} (97%)
 rename tests/{Http/RedirectorTest.php => http/test-redirector.php} (98%)
 rename tests/{Http/ResponseFactoryTest.php => http/test-response-factory.php} (93%)
 rename tests/{Http/RouterTest.php => http/test-router.php} (99%)
 rename tests/{Http/UploadedFileTest.php => http/test-uploaded-file.php} (94%)
 rename tests/{Http/UrlGeneratorTest.php => http/test-url-generator.php} (98%)
 rename tests/{Log/LogManagerTest.php => log/test-log-manager.php} (97%)
 rename tests/{Queue/providers/WordPressCronQueueTest.php => queue/providers/test-wordpress-cron-queue.php} (98%)
 rename tests/{Queue/DispatcherTest.php => queue/test-dispatcher.php} (96%)
 rename tests/{Queue/QueueManagerTest.php => queue/test-queue-manager.php} (94%)
 rename tests/{Queue/WorkerTest.php => queue/test-worker.php} (98%)
 rename tests/{Scheduling/EventTest.php => scheduling/test-event.php} (97%)
 rename tests/{Scheduling/FrequencyTest.php => scheduling/test-frequency.php} (98%)
 rename tests/{Support/Providers/ModelRegisterProviderTest.php => support/providers/test-model-register-provider.php} (94%)
 rename tests/{Support/ArrTest.php => support/test-arr.php} (99%)
 rename tests/{Support/CollectionTest.php => support/test-collection.php} (99%)
 rename tests/{Support/EnvironmentTest.php => support/test-environment.php} (94%)
 rename tests/{Support/ForwardCallsTest.php => support/test-forward-calls.php} (98%)
 rename tests/{Support/PluralizerTest.php => support/test-pluralizer.php} (99%)
 rename tests/{Support/ServiceProviderTest.php => support/test-service-provider.php} (99%)
 rename tests/{Support/StrTest.php => support/test-str.php} (99%)
 rename tests/{Support/StringableTest.php => support/test-stringable.php} (99%)
 rename tests/{FakerTest.php => test-faker.php} (96%)
 rename tests/{Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot__1.yml => testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot__1.yml} (100%)
 rename tests/{Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http__1.html => testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html} (100%)
 rename tests/{Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http_partial__1.html => testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html} (100%)
 rename tests/{Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__1.json => testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__1.json} (100%)
 rename tests/{Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__2.json => testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__2.json} (100%)
 rename tests/{Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__3.json => testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__3.json} (100%)
 rename tests/{Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_multiple_requests__1.yml => testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_multiple_requests__1.yml} (100%)
 rename tests/{Testing/Concerns/BlockAssertionsTest.php => testing/concerns/test-block-assertions.php} (95%)
 rename tests/{Testing/Concerns/DeprecationsTest.php => testing/concerns/test-deprecations.php} (96%)
 rename tests/{Testing/Concerns/ElementAssertionsTest.php => testing/concerns/test-element-assertions.php} (96%)
 rename tests/{Testing/Concerns/IncorrectUsageTest.php => testing/concerns/test-incorrect-usage.php} (96%)
 rename tests/{Testing/Concerns/InteractsWithConsoleTest.php => testing/concerns/test-interacts-with-console.php} (93%)
 rename tests/{Testing/Concerns/InteractsWithExternalRequestsTest.php => testing/concerns/test-interacts-with-external-requests.php} (99%)
 rename tests/{Testing/Concerns/InteractsWithHooksTest.php => testing/concerns/test-interacts-with-hooks.php} (98%)
 rename tests/{Testing/Concerns/MakesHttpRequestsTest.php => testing/concerns/test-makes-http-requests.php} (99%)
 rename tests/{Testing/Concerns/WordPressAuthenticationTest.php => testing/concerns/test-wordpress-authentication.php} (90%)
 rename tests/{Testing/CoreTestShimTest.php => testing/test-core-test-shim.php} (88%)
 rename tests/{Testing/PermalinkStructureTest.php => testing/test-permalink-structure.php} (97%)
 rename tests/{Testing/WithFakerTest.php => testing/test-with-faker.php} (62%)
 rename tests/{Testkit/Concerns/ExampleOverload.php => testkit/concerns/trait-example-overload.php} (83%)
 rename tests/{Testkit => testkit}/fixtures/global-functions.php (100%)
 rename tests/{Testkit/TestkitInstallWordPressTest.php => testkit/test-testkit-install-wordpress.php} (92%)
 rename tests/{Testkit/TestkitTestCaseTest.php => testkit/test-testkit-test-case.php} (87%)
 rename tests/{Testkit/WithFakerTest.php => testkit/test-with-faker.php} (85%)
 rename tests/{View/BladeViewsTest.php => view/test-blade-views.php} (93%)
 rename tests/{View/FileEngineTest.php => view/test-file-engine.php} (91%)
 rename tests/{View/PhpViewsTest.php => view/test-php-views.php} (99%)
 rename tests/{View/ViewFinderTest.php => view/test-view-finder.php} (96%)

diff --git a/.gitignore b/.gitignore
index 60f1b891..45629dbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ vendor
 # Cache files
 .phpcs/*.json
 .phpunit.result.cache
-.phpunit.cache/
 
 # Composer files
 composer.lock
@@ -27,4 +26,4 @@ Thumbs.db
 # IDE files
 *.code-workspace
 .idea
-.vscode
+.vscode
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0266a5e..e61314be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.12.9 - 2023-11-27
+
+### Changed
+
+- Removed PHPUnit 10 support to prevent a breaking change. Moved to 1.x.
+
 ## v0.12.8 - 2023-11-21
 
 ### Changed
diff --git a/bin/convert-psr4-dir.php b/bin/convert-psr4-dir.php
deleted file mode 100644
index 0dc6e535..00000000
--- a/bin/convert-psr4-dir.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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 );
diff --git a/bin/convert-psr4-file.php b/bin/convert-psr4-file.php
deleted file mode 100644
index 24085d0a..00000000
--- a/bin/convert-psr4-file.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Helper script to convert the tests/ package to PSR-4 coding standards.
- *
- * The eventual plan is to use this for the rest of the project when that can be
- * converted over. Ideally this can be a reusable command in the future.
- *
- * phpcs:disable
- */
-
-use Symfony\Component\Finder\Finder;
-
-use function Mantle\Support\Helpers\str;
-
-require_once __DIR__ . '/../vendor/autoload.php';
-
-$finder = ( new Finder() )
-	->in( realpath( __DIR__ . '/../tests' ) )
-	->name( '*.php' )
-	->notName( [ 'bootstrap.php', 'sub-example.php', 'base-example.php' ] )
-	->notPath( '#fixtures|__snapshots__|template-parts#' );
-
-$index = [];
-$pass  = true;
-
-foreach ( $finder as $file ) {
-	$filename = str( $file->getFilename() )->lower();
-
-	if ( $filename->startsWith( 'test-' ) ) {
-		$new_filename = $filename
-			->after( 'test-' )
-			->before( '.php' )
-			->studly()
-			->append( 'Test.php' )
-			->replace( 'Wordpress', 'WordPress' );
-
-		$old_class_name = $filename
-			->before( '.php' )
-			->studlyUnderscore()
-			->replace( 'Wordpress', 'WordPress' );
-
-		$new_class_name = $filename
-			->after( 'test-' )
-			->before( '.php' )
-			->studly()
-			->append( 'Test' )
-			->replace( 'Wordpress', 'WordPress' );
-	} else {
-		foreach ( [ 'trait', 'class' ] as $type ) {
-			if ( ! $filename->startsWith( "{$type}-" ) ) {
-				continue;
-			}
-
-			$new_filename = $filename
-				->after( "{$type}-" )
-				->before( '.php' )
-				->studly()
-				->append( '.php' )
-				->replace( 'Wordpress', 'WordPress' );
-
-			$old_class_name = $filename
-				->after( "{$type}-" )
-				->before( '.php' )
-				->studlyUnderscore();
-
-			$new_class_name = $filename
-				->after( "{$type}-" )
-				->before( '.php' )
-				->studly()
-				->replace( 'Wordpress', 'WordPress' );
-		}
-	}
-
-	// Check if the file contains the class.
-	$contents = str( file_get_contents( $file->getRealPath() ) );
-
-	$type = $filename->startsWith( 'trait-' ) ? 'trait' : 'class';
-
-	if ( ! $contents->contains( "{$type} {$old_class_name->value()} ", true ) ) {
-		echo $file->getRealPath() . ' does not contain the expected legacy ' . $type . ' ' . $old_class_name->value() . PHP_EOL;
-
-		$pass = false;
-
-		continue;
-	}
-
-	$index[] = [
-		$type,
-		[
-			$file->getRealPath(),
-			$old_class_name->value(),
-		],
-		[
-			$file->getPath() . '/' . $new_filename->value(),
-			$new_class_name->value(),
-		],
-	];
-}
-
-if ( ! $pass ) {
-	echo "\n\nPlease fix the above errors before continuing.\n";
-
-	exit( 1 );
-}
-
-echo 'Processing ' . count( $index ) . ' files...';
-
-foreach ( $index as $item ) {
-	[ $type, $old, $new ] = $item;
-
-	[ $old_file, $old_class ] = $old;
-	[ $new_file, $new_class ] = $new;
-
-	// Update the file with the new class name.
-	file_put_contents(
-		$old_file,
-		str( file_get_contents( $old_file ) )->replace( "{$type} {$old_class} ", "{$type} {$new_class} ", false )->value(),
-	);
-
-	// Update the file name.
-	if ( ! rename( $old_file, $new_file ) ) {
-		echo "Failed to rename {$old_file} to {$new_file}.\n";
-
-		exit( 1 );
-	}
-
-	echo "Updated {$old_file} to {$new_file} ({$old_class} to {$new_class}).\n";
-}
-
-echo "\nDONE!\n";
-
-exit( 0 );
diff --git a/composer.json b/composer.json
index 714474f4..5ebdbbf0 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "require": {
         "php": "^8.0",
         "alleyinteractive/composer-wordpress-autoloader": "^1.0",
-        "alleyinteractive/wp-asset-manager": "^1.3.4",
+        "alleyinteractive/wp-asset-manager": "^1.3.3",
         "alleyinteractive/wp-caper": "^2.0.1",
         "alleyinteractive/wp-concurrent-remote-requests": "^1.0.2",
         "alleyinteractive/wp-filter-side-effects": "^2.0",
@@ -28,13 +28,13 @@
         "monolog/monolog": "^2.9.1",
         "nesbot/carbon": "^2.68.1",
         "nette/php-generator": "^3.6.9",
-        "nunomaduro/collision": "^6.0 || ^7.0",
+        "nunomaduro/collision": "^6.4",
         "nunomaduro/termwind": "^1.15.1",
         "psr/container": "^1.1.1 || ^2.0.2",
         "psr/log": "^1.0.1 || ^2.0 || ^3.0",
         "psr/simple-cache": "^3.0",
         "ramsey/uuid": "^4.7.4",
-        "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1",
+        "spatie/phpunit-snapshot-assertions": "^4.2",
         "symfony/console": "^6.0.19",
         "symfony/finder": "^6.0.19",
         "symfony/http-foundation": "^6.0.20",
@@ -54,8 +54,8 @@
         "mockery/mockery": "^1.6.6",
         "php-stubs/wp-cli-stubs": "^2.8",
         "phpstan/phpdoc-parser": "^1.23.1",
-        "phpstan/phpstan": "1.10.44",
-        "phpunit/phpunit": "^9.3.3 || ^10.0.7",
+        "phpstan/phpstan": "1.10.43",
+        "phpunit/phpunit": "^9.3.3",
         "predis/predis": "^2.2.0",
         "squizlabs/php_codesniffer": "^3.7",
         "symplify/monorepo-builder": "^10.3.3",
@@ -86,8 +86,6 @@
         "mantle-framework/testkit": "self.version",
         "mantle-framework/view": "self.version"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "autoload": {
         "files": [
             "src/mantle/framework/helpers.php",
@@ -102,11 +100,6 @@
             "src/mantle/testing/autoload.php"
         ]
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Mantle\\Tests\\": "tests/"
-        }
-    },
     "config": {
         "allow-plugins": {
             "dealerdirect/phpcodesniffer-composer-installer": true,
@@ -144,5 +137,7 @@
             "@phpstan",
             "@phpunit"
         ]
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/monorepo-builder.php b/monorepo-builder.php
index f0ab4b80..e61ed5f8 100644
--- a/monorepo-builder.php
+++ b/monorepo-builder.php
@@ -54,7 +54,7 @@
 			],
 			ComposerJsonSection::REQUIRE_DEV => [
 				'alleyinteractive/alley-coding-standards' => '^1.0',
-				'phpunit/phpunit'                         => '^9.3.3|^10.0.7',
+				'phpunit/phpunit'                         => '^9.6.10',
 			],
 		],
 	);
diff --git a/phpunit.xml b/phpunit.xml
index 397400ca..ee9e6886 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,14 +1,15 @@
-<?xml version="1.0"?>
 <phpunit
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	bootstrap="tests/bootstrap.php"
-	backupGlobals="false"
-	colors="true"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd"
+    bootstrap="tests/bootstrap.php"
+    backupGlobals="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+		printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
 >
-	<testsuites>
-		<testsuite name="mantle-framework">
-			<directory suffix="Test.php">./tests/</directory>
-		</testsuite>
-	</testsuites>
+    <testsuites>
+        <testsuite name="mantle-framework">
+            <directory prefix="test-" suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>
diff --git a/src/mantle/assets/composer.json b/src/mantle/assets/composer.json
index 7ac86c95..23467eb3 100644
--- a/src/mantle/assets/composer.json
+++ b/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.4",
+        "alleyinteractive/wp-asset-manager": "^1.3.3",
         "mantle-framework/contracts": "^0.12",
         "mantle-framework/support": "^0.12"
     },
diff --git a/src/mantle/support/class-stringable.php b/src/mantle/support/class-stringable.php
index b115b963..a8b47bf5 100644
--- a/src/mantle/support/class-stringable.php
+++ b/src/mantle/support/class-stringable.php
@@ -737,15 +737,6 @@ public function studly() {
 		return new static( Str::studly( $this->value ) );
 	}
 
-	/**
-	 * Convert a value to studly caps case using underscores.
-	 *
-	 * @return static
-	 */
-	public function studlyUnderscore() {
-		return new static( Str::studly_underscore( $this->value ) );
-	}
-
 	/**
 	 * Returns the portion of the string specified by the start and length parameters.
 	 *
diff --git a/src/mantle/testing/class-assert.php b/src/mantle/testing/class-assert.php
new file mode 100644
index 00000000..0d97a232
--- /dev/null
+++ b/src/mantle/testing/class-assert.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * This file contains the Assert class
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Testing;
+
+use PHPUnit\Framework\Assert as PHPUnit;
+use PHPUnit\Framework\Constraint\RegularExpression;
+
+/**
+ * Internal assertions that exist in PHPUnit 8.x.
+ * Once the code base is migrated to use PHPUnit 8+ we can remove this file.
+ *
+ * @internal This class is not meant to be used or overwritten outside the framework itself.
+ */
+abstract class Assert extends PHPUnit {
+
+	/**
+	 * Asserts that a file does not exist.
+	 *
+	 * @param  string $filename
+	 * @param  string $message
+	 * @return void
+	 */
+	public static function assertFileDoesNotExist( string $filename, string $message = '' ): void {
+		static::assertFalse( is_file( $filename ), $message );
+	}
+
+	/**
+	 * Asserts that a directory does not exist.
+	 *
+	 * @param  string $directory
+	 * @param  string $message
+	 * @return void
+	 */
+	public static function assertDirectoryDoesNotExist( string $directory, string $message = '' ): void {
+		static::assertFalse( is_dir( $directory ), $message );
+	}
+
+	/**
+	 * Asserts that a string matches a given regular expression.
+	 *
+	 * @param  string $pattern
+	 * @param  string $string
+	 * @param  string $message
+	 * @return void
+	 */
+	public static function assertMatchesRegularExpression( string $pattern, string $string, string $message = '' ): void {
+		static::assertThat( $string, new RegularExpression( $pattern ), $message );
+	}
+}
diff --git a/src/mantle/testing/concerns/trait-deprecations.php b/src/mantle/testing/concerns/trait-deprecations.php
index 61dd0bab..8fe38f43 100644
--- a/src/mantle/testing/concerns/trait-deprecations.php
+++ b/src/mantle/testing/concerns/trait-deprecations.php
@@ -10,11 +10,12 @@
 namespace Mantle\Testing\Concerns;
 
 use Mantle\Support\Str;
+use PHPUnit\Util\Test;
 
 use function Mantle\Support\Helpers\collect;
 
 trait Deprecations {
-	use Output_Messages, Reads_Annotations;
+	use Output_Messages;
 
 	/**
 	 * Expected deprecation calls.
@@ -48,7 +49,14 @@ trait Deprecations {
 	 * Sets up the expectations for testing a deprecated call.
 	 */
 	public function deprecations_set_up() {
-		$annotations = $this->get_annotations_for_method();
+		if ( ! method_exists( $this, 'getAnnotations' ) ) {
+			$annotations = Test::parseTestMethodAnnotations(
+				static::class,
+				$this->getName()
+			);
+		} else {
+			$annotations = $this->getAnnotations();
+		}
 
 		foreach ( [ 'class', 'method' ] as $depth ) {
 			if ( ! empty( $annotations[ $depth ]['expectedDeprecated'] ) ) {
diff --git a/src/mantle/testing/concerns/trait-incorrect-usage.php b/src/mantle/testing/concerns/trait-incorrect-usage.php
index 1c0e1d03..9f5ac3fd 100644
--- a/src/mantle/testing/concerns/trait-incorrect-usage.php
+++ b/src/mantle/testing/concerns/trait-incorrect-usage.php
@@ -10,6 +10,8 @@
 namespace Mantle\Testing\Concerns;
 
 use Mantle\Support\Str;
+use PHPUnit\TextUI\XmlConfiguration\PHPUnit;
+use PHPUnit\Util\Test;
 
 use function Mantle\Support\Helpers\collect;
 
@@ -20,7 +22,7 @@
  * as expected or ignored.
  */
 trait Incorrect_Usage {
-	use Output_Messages, Reads_Annotations;
+	use Output_Messages;
 
 	/**
 	 * Expected "doing it wrong" calls.
@@ -54,7 +56,14 @@ trait Incorrect_Usage {
 	 * Sets up the expectations for testing a deprecated call.
 	 */
 	public function incorrect_usage_set_up() {
-		$annotations = $this->get_annotations_for_method();
+		if ( ! method_exists( $this, 'getAnnotations' ) ) {
+			$annotations = Test::parseTestMethodAnnotations(
+				static::class,
+				$this->getName()
+			);
+		} else {
+			$annotations = $this->getAnnotations();
+		}
 
 		foreach ( [ 'class', 'method' ] as $depth ) {
 			if ( ! empty( $annotations[ $depth ]['expectedIncorrectUsage'] ) ) {
diff --git a/src/mantle/testing/concerns/trait-reads-annotations.php b/src/mantle/testing/concerns/trait-reads-annotations.php
deleted file mode 100644
index 6d64df2a..00000000
--- a/src/mantle/testing/concerns/trait-reads-annotations.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Reads_Annotations trait file
- *
- * @package Mantle
- */
-
-namespace Mantle\Testing\Concerns;
-
-use PHPUnit\Metadata\Annotation\Parser\DocBlock;
-use PHPUnit\Metadata\Annotation\Parser\Registry;
-use PHPUnit\Util\Test;
-
-/**
- * Read annotations for testing that supports multiple versions of PHPUnit.
- *
- * @mixin \PHPUnit\Framework\TestCase
- */
-trait Reads_Annotations {
-	/**
-	 * Read annotations for the current test case and method.
-	 *
-	 * @return array
-	 */
-	public function get_annotations_for_method(): array {
-		// PHPUnit 9.4 and below method.
-		if ( method_exists( $this, 'getAnnotations' ) ) {
-			return $this->getAnnotations();
-		}
-
-		// Use the PHPUnit ^9.5 method if available.
-		if ( method_exists( Test::class, 'parseTestMethodAnnotations' ) ) { // @phpstan-ignore-line
-			return Test::parseTestMethodAnnotations(
-				static::class,
-				$this->getName(), // @phpstan-ignore-line
-			);
-		}
-
-		// Use the PHPUnit 10.x method if available.
-		if ( class_exists( Registry::class ) && class_exists( DocBlock::class ) ) {
-			$registry = Registry::getInstance();
-
-			return [
-				'class'  => $registry->forClassName( static::class )->symbolAnnotations(),
-				'method' => $registry->forMethod( static::class, $this->name() )->symbolAnnotations(),
-			];
-		}
-
-		// Throw a warning if we can't read annotations.
-		trigger_error( // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
-			'Unable to read annotations for test method. Please file an issue with https://github.com/alleyinteractive/mantle-framework',
-			E_USER_WARNING
-		);
-
-		return [];
-	}
-}
diff --git a/src/mantle/testkit/composer.json b/src/mantle/testkit/composer.json
index c707523b..5049aa74 100644
--- a/src/mantle/testkit/composer.json
+++ b/src/mantle/testkit/composer.json
@@ -13,9 +13,9 @@
         "mantle-framework/faker": "^0.12",
         "mantle-framework/support": "^0.12",
         "mantle-framework/testing": "^0.12",
-        "nunomaduro/collision": "^6.0 || ^7.0",
-        "phpunit/phpunit": "^9.3.3|^10.0.7",
-        "symfony/http-foundation": "^6.0"
+        "nunomaduro/collision": "^6.4",
+        "phpunit/phpunit": "^9.6.10",
+        "symfony/http-foundation": "^6.0.20"
     },
     "extra": {
         "wordpress-autoloader": {
diff --git a/tests/Assets/AssetManagerTest.php b/tests/Assets/AssetManagerTest.php
deleted file mode 100644
index 43fb6f6b..00000000
--- a/tests/Assets/AssetManagerTest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace Mantle\Tests\Assets;
-
-use Mantle\Assets\Asset_Manager;
-
-/**
- * @group assets
- */
-class AssetManagerTest extends TestCase {
-	public function test_register_script() {
-		$manager = new Asset_Manager();
-		$manager
-			->script(
-				'script-handle',
-				'https://example.org/script.js',
-				[
-					'jquery',
-				],
-				'global',
-				'sync',
-			);
-
-		$this->assertStringContainsString(
-			'<script src="https://example.org/script.js" id="script-handle-js"></script>',
-			$this->get_wp_head(),
-		);
-	}
-
-	public function test_register_style() {
-		$manager = new Asset_Manager();
-		$manager
-			->style(
-				'style-handle',
-				'https://example.org/style.css',
-				[]
-			);
-
-		$this->assertStringContainsString(
-			'<link rel=\'stylesheet\' id=\'style-handle-css\' href=\'https://example.org/style.css\' media=\'all\' />',
-			$this->get_wp_head(),
-		);
-	}
-
-	public function test_async_script() {
-		$manager = new Asset_Manager();
-		$manager
-			->script(
-				'testsync-script-handle',
-				'https://example.org/example-script.js',
-			);
-
-		$manager->async( 'testsync-script-handle' );
-
-		$this->assertStringContainsString(
-			'<script async src="https://example.org/example-script.js" id="testsync-script-handle-js"></script>',
-			$this->get_wp_head(),
-		);
-	}
-
-	public function test_fluent_script() {
-		$manager = new Asset_Manager();
-		$manager
-			->script( 'example-fluent' )
-			->src( 'https://example.org/example-fluent.js' )
-			->async();
-
-		$this->assertStringContainsString(
-			'<script async src="https://example.org/example-fluent.js" id="example-fluent-js"></script>',
-			$this->get_wp_head(),
-		);
-	}
-
-	public function test_fluent_script_helper() {
-		asset()
-			->script( 'example-helper' )
-			->src( 'https://example.org/example-helper.js' )
-			->async();
-
-		$this->assertStringContainsString(
-			'<script async src="https://example.org/example-helper.js" id="example-helper-js"></script>',
-			$this->get_wp_head(),
-		);
-	}
-
-	public function test_core_dependency() {
-		global $wp_scripts;
-
-		// 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' );
-		}
-
-		$version = $wp_scripts->registered['swfobject']->ver;
-
-		// Get the core version of the asset.
-		( new Asset_Manager() )
-			->script( 'swfobject' )
-			->version( null )
-			->async();
-
-		$this->assertStringContainsString(
-			'<script async src="http://example.org/wp-includes/js/swfobject.js?ver=' . $version . '" id="swfobject-js"></script>',
-			$this->get_wp_head(),
-		);
-	}
-}
diff --git a/tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php b/tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php
deleted file mode 100644
index ae2e5251..00000000
--- a/tests/Framework/Helpers/NullableSiteObjectsTestCaseTest.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Class file for Nullable_Site_Objects_Test_Case
- *
- * @package Mantle
- */
-
-namespace Mantle\Tests\Framework\Helpers;
-
-use Mantle\Testing\Framework_Test_Case;
-use function Mantle\Support\Helpers\get_site_object;
-
-/**
- * Unit tests for nullable site object functions.
- */
-class NullableSiteObjectsTestCaseTest extends Framework_Test_Case {
-	public function setUp(): void {
-		parent::setUp();
-
-		if ( ! \is_multisite() ) {
-			$this->markTestSkipped( 'Multisite is not enabled.' );
-		}
-	}
-
-	/**
-	 * Test that `get_site_object()` returns a site object.
-	 */
-	public function test_site_object_returns_site() {
-		$known_id = self::factory()->blog->create();
-
-		$found_object = get_site_object( $known_id );
-
-		$this->assertInstanceOf( \WP_Site::class, $found_object );
-
-		$this->assertSame( $known_id, (int) $found_object->blog_id );
-	}
-
-	/**
-	 * Test that `get_site_object()` returns null when there is no site.
-	 */
-	public function test_site_object_returns_null() {
-		$found_object = get_site_object( -99 );
-
-		$this->assertNull( $found_object );
-	}
-}
diff --git a/tests/Assets/TestCase.php b/tests/assets/class-test-case.php
similarity index 95%
rename from tests/Assets/TestCase.php
rename to tests/assets/class-test-case.php
index 0d2a7313..5773d3c1 100644
--- a/tests/Assets/TestCase.php
+++ b/tests/assets/class-test-case.php
@@ -9,7 +9,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use WP_Scripts;
 
-abstract class TestCase extends Framework_Test_Case {
+abstract class Test_Case extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
@@ -48,7 +48,6 @@ function() {
 	protected function get_wp_head(): string {
 		ob_start();
 		do_action( 'wp_head' );
-		// do_action( 'wp_footer' );
 		return ob_get_clean();
 	}
 
diff --git a/tests/Assets/AssetLoaderTest.php b/tests/assets/test-asset-loader.php
similarity index 98%
rename from tests/Assets/AssetLoaderTest.php
rename to tests/assets/test-asset-loader.php
index 53b8c3d7..988286c2 100644
--- a/tests/Assets/AssetLoaderTest.php
+++ b/tests/assets/test-asset-loader.php
@@ -5,7 +5,7 @@
 use Mantle\Assets\Asset_Loader;
 use Mantle\Assets\Exception\Asset_Not_Found;
 
-class AssetLoaderTest extends TestCase {
+class Test_Asset_Loader extends Test_Case {
 	public string $build_dir = '';
 
 	public Asset_Loader $loader;
diff --git a/tests/assets/test-asset-manager.php b/tests/assets/test-asset-manager.php
new file mode 100644
index 00000000..cd96f32f
--- /dev/null
+++ b/tests/assets/test-asset-manager.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Mantle\Tests\Assets;
+
+use Mantle\Assets\Asset_Manager;
+
+/**
+ * @group assets
+ */
+class Test_Asset_Manager extends Test_Case {
+	public function test_register_script() {
+		$manager = new Asset_Manager();
+		$manager
+			->script(
+				"script-handle",
+				"https://example.org/script.js",
+				[
+					"jquery",
+				],
+				"global",
+				"sync",
+			);
+
+		$this->assertStringContainsString(
+			"<script src=\"https://example.org/script.js\" id=\"script-handle-js\"></script>",
+			$this->get_wp_head(),
+		);
+	}
+
+	public function test_register_style() {
+		$manager = new Asset_Manager();
+		$manager
+			->style(
+				"style-handle",
+				"https://example.org/style.css",
+				[]
+			);
+
+		$this->assertStringContainsString(
+			"<link rel='stylesheet' id='style-handle-css' href='https://example.org/style.css' media='all' />",
+			$this->get_wp_head(),
+		);
+	}
+
+	public function test_async_script() {
+		$manager = new Asset_Manager();
+		$manager
+			->script(
+				"testsync-script-handle",
+				"https://example.org/example-script.js",
+			);
+
+		$manager->async( "testsync-script-handle" );
+
+		$this->assertStringContainsString(
+			"<script async src=\"https://example.org/example-script.js\" id=\"testsync-script-handle-js\"></script>",
+			$this->get_wp_head(),
+		);
+	}
+
+	public function test_fluent_script() {
+		$manager = new Asset_Manager();
+		$manager
+			->script( "example-fluent" )
+			->src( "https://example.org/example-fluent.js" )
+			->async();
+
+		$this->assertStringContainsString(
+			"<script async src=\"https://example.org/example-fluent.js\" id=\"example-fluent-js\"></script>",
+			$this->get_wp_head(),
+		);
+	}
+
+	public function test_fluent_script_helper() {
+		asset()
+			->script( "example-helper" )
+			->src( "https://example.org/example-helper.js" )
+			->async();
+
+		$this->assertStringContainsString(
+			"<script async src=\"https://example.org/example-helper.js\" id=\"example-helper-js\"></script>",
+			$this->get_wp_head(),
+		);
+	}
+
+	public function test_core_dependency() {
+		global $wp_scripts;
+
+		// 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;
+
+		// Get the core version of the asset.
+		( new Asset_Manager() )
+			->script( "swfobject" )
+			->version( null )
+			->async();
+
+		$this->assertStringContainsString(
+			"<script async src=\"http://example.org/wp-includes/js/swfobject.js?ver={$version}\" id=\"swfobject-js\"></script>",
+			$this->get_wp_head(),
+		);
+	}
+}
diff --git a/tests/Cache/CacheManagerTest.php b/tests/cache/test-cache-manager.php
similarity index 97%
rename from tests/Cache/CacheManagerTest.php
rename to tests/cache/test-cache-manager.php
index 6bc70c21..aeae9f91 100644
--- a/tests/Cache/CacheManagerTest.php
+++ b/tests/cache/test-cache-manager.php
@@ -7,7 +7,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Predis\Connection\ConnectionException;
 
-class CacheManagerTest extends Framework_Test_Case {
+class Test_Cache_Manager extends Framework_Test_Case {
 	public function test_unconfigured_store() {
 		$this->expectException( InvalidArgumentException::class );
 		$this->expectExceptionMessage( 'Driver not specified for [invalid-store].' );
diff --git a/tests/Config/RepositoryTest.php b/tests/config/test-repository.php
similarity index 97%
rename from tests/Config/RepositoryTest.php
rename to tests/config/test-repository.php
index 7f1b53cd..7858361f 100644
--- a/tests/Config/RepositoryTest.php
+++ b/tests/config/test-repository.php
@@ -4,7 +4,7 @@
 use Mantle\Config\Repository;
 use PHPUnit\Framework\TestCase;
 
-class RepositoryTest extends TestCase {
+class Test_Repository extends TestCase {
 	/**
 	 * @var Repository
 	 */
diff --git a/tests/Console/generators/PrinterTest.php b/tests/console/generators/test-printer.php
similarity index 98%
rename from tests/Console/generators/PrinterTest.php
rename to tests/console/generators/test-printer.php
index 4b9b8bf5..badb2e83 100644
--- a/tests/Console/generators/PrinterTest.php
+++ b/tests/console/generators/test-printer.php
@@ -7,7 +7,7 @@
 use PHP_CodeSniffer\Runner;
 use PHPUnit\Framework\TestCase;
 
-class PrinterTest extends TestCase {
+class Test_Printer extends TestCase {
 	protected static $temp_dir;
 	protected static $argv;
 
diff --git a/tests/Console/hook-usage/base-example.php b/tests/console/hook-usage/base-example.php
similarity index 100%
rename from tests/Console/hook-usage/base-example.php
rename to tests/console/hook-usage/base-example.php
diff --git a/tests/Console/hook-usage/sub/sub-example.php b/tests/console/hook-usage/sub/sub-example.php
similarity index 100%
rename from tests/Console/hook-usage/sub/sub-example.php
rename to tests/console/hook-usage/sub/sub-example.php
diff --git a/tests/Console/CommandTest.php b/tests/console/test-command.php
similarity index 98%
rename from tests/Console/CommandTest.php
rename to tests/console/test-command.php
index ceab1625..a5c15a24 100644
--- a/tests/Console/CommandTest.php
+++ b/tests/console/test-command.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-class CommandTest extends TestCase {
+class Test_Command extends TestCase {
 
 	public function test_registering_command_with_just_name() {
 		$command = new class extends Command {
diff --git a/tests/Console/GeneratorCommandTest.php b/tests/console/test-generator-command.php
similarity index 98%
rename from tests/Console/GeneratorCommandTest.php
rename to tests/console/test-generator-command.php
index 46b25add..6622020b 100644
--- a/tests/Console/GeneratorCommandTest.php
+++ b/tests/console/test-generator-command.php
@@ -13,7 +13,7 @@
 use Mantle\Framework\Console\Generators\Stub_Generator_Command;
 use Mockery as m;
 
-class GeneratorCommandTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Generator_Command extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	/**
 	 * @var Application
 	 */
diff --git a/tests/Console/HookUsageCommandTest.php.bak b/tests/console/test-hook-usage-command.php
similarity index 96%
rename from tests/Console/HookUsageCommandTest.php.bak
rename to tests/console/test-hook-usage-command.php
index 06b8c35d..0618b1af 100644
--- a/tests/Console/HookUsageCommandTest.php.bak
+++ b/tests/console/test-hook-usage-command.php
@@ -12,7 +12,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 // Disabling until command testing is reimplimented.
-// class HookUsageCommandTest extends Framework_Test_Case {
+// class Test_Hook_Usage_Command extends Framework_Test_Case {
 
 // 	public function test_do_action() {
 // 		$usage = $this->run_command( 'init' )->all();
diff --git a/tests/Console/ParserTest.php b/tests/console/test-parser.php
similarity index 99%
rename from tests/Console/ParserTest.php
rename to tests/console/test-parser.php
index 71674889..a4d35190 100644
--- a/tests/Console/ParserTest.php
+++ b/tests/console/test-parser.php
@@ -6,7 +6,7 @@
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 
-class ParserTest extends TestCase {
+class Test_Parser extends TestCase {
 
 	public function testBasicParameterParsing() {
 		$results = Parser::parse( 'command:name' );
diff --git a/tests/Console/test.stub b/tests/console/test.stub
similarity index 100%
rename from tests/Console/test.stub
rename to tests/console/test.stub
diff --git a/tests/Container/ContainerCallTest.php b/tests/container/test-container-call.php
similarity index 99%
rename from tests/Container/ContainerCallTest.php
rename to tests/container/test-container-call.php
index 0b575a61..62a14321 100644
--- a/tests/Container/ContainerCallTest.php
+++ b/tests/container/test-container-call.php
@@ -10,7 +10,7 @@
 use ReflectionException;
 use stdClass;
 
-class ContainerCallTest extends TestCase {
+class Test_Container_Call 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\ContainerCallTest' );
+		$this->expectExceptionMessage( 'Unable to resolve dependency [Parameter #0 [ <required> $foo ]] in class Mantle\Tests\Container\Test_Container_Call' );
 
 		$container = new Container();
 		$foo       = $container->call(
diff --git a/tests/Container/ContainerTest.php b/tests/container/test-container.php
similarity index 99%
rename from tests/Container/ContainerTest.php
rename to tests/container/test-container.php
index cb3330d5..aab2526b 100644
--- a/tests/Container/ContainerTest.php
+++ b/tests/container/test-container.php
@@ -8,7 +8,7 @@
 use Psr\Container\ContainerExceptionInterface;
 use stdClass;
 
-class ContainerTest extends TestCase {
+class Test_Container extends TestCase {
 	protected function tearDown(): void {
 		Container::set_instance( null );
 	}
@@ -443,7 +443,7 @@ function () {
 
 	public function testMakeWithMethodIsAnAliasForMakeMethod() {
 		$mock = $this->getMockBuilder( Container::class )
-			->onlyMethods( [ 'make' ] )
+			->setMethods( [ 'make' ] )
 			->getMock();
 
 		$mock->expects( $this->once() )
diff --git a/tests/Database/Factory/FactoryTest.php b/tests/database/factory/test-factory.php
similarity index 99%
rename from tests/Database/Factory/FactoryTest.php
rename to tests/database/factory/test-factory.php
index 08cde70c..67cd6992 100644
--- a/tests/Database/Factory/FactoryTest.php
+++ b/tests/database/factory/test-factory.php
@@ -9,7 +9,7 @@
 /**
  * @group factory
  */
-class FactoryTest extends Framework_Test_Case {
+class Test_Factory extends Framework_Test_Case {
 	public function test_create_basic_model() {
 		$factory = Testable_Post::factory();
 
diff --git a/tests/Database/Factory/UnitTestingFactoryTest.php b/tests/database/factory/test-unit-testing-factory.php
similarity index 99%
rename from tests/Database/Factory/UnitTestingFactoryTest.php
rename to tests/database/factory/test-unit-testing-factory.php
index 2a75c210..54cf3b81 100644
--- a/tests/Database/Factory/UnitTestingFactoryTest.php
+++ b/tests/database/factory/test-unit-testing-factory.php
@@ -17,7 +17,7 @@
  *
  * @group factory
  */
-class UnitTestingFactoryTest extends Framework_Test_Case {
+class Test_Unit_Testing_Factory extends Framework_Test_Case {
 	use With_Faker;
 
 	public function test_post_factory() {
diff --git a/tests/Database/Model/registration/RegisterMetaTest.php b/tests/database/model/registration/test-register-meta.php
similarity index 95%
rename from tests/Database/Model/registration/RegisterMetaTest.php
rename to tests/database/model/registration/test-register-meta.php
index 25a59c1d..1853b460 100644
--- a/tests/Database/Model/registration/RegisterMetaTest.php
+++ b/tests/database/model/registration/test-register-meta.php
@@ -6,7 +6,7 @@
 use Mantle\Database\Model\Registration\Register_Meta;
 use Mantle\Testing\Framework_Test_Case;
 
-class RegisterMetaTest extends Framework_Test_Case {
+class Test_Register_Meta extends Framework_Test_Case {
 	public function test_register_meta() {
 		$this->expectApplied( 'mantle_register_meta_default_args' )->once()->andReturn(
 			[
diff --git a/tests/Database/Model/registration/RegisterPostTypeTest.php b/tests/database/model/registration/test-register-post-type.php
similarity index 98%
rename from tests/Database/Model/registration/RegisterPostTypeTest.php
rename to tests/database/model/registration/test-register-post-type.php
index 3864aa7e..4a93f25c 100644
--- a/tests/Database/Model/registration/RegisterPostTypeTest.php
+++ b/tests/database/model/registration/test-register-post-type.php
@@ -11,7 +11,7 @@
 use Mantle\REST_API\Registered_REST_Field;
 use Mantle\Testing\Framework_Test_Case;
 
-class RegisterPostTypeTest extends Framework_Test_Case {
+class Test_Register_Post_Type extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		remove_all_actions( 'init' );
diff --git a/tests/Database/Model/registration/RegisterTaxonomyTest.php b/tests/database/model/registration/test-register-taxonomy.php
similarity index 96%
rename from tests/Database/Model/registration/RegisterTaxonomyTest.php
rename to tests/database/model/registration/test-register-taxonomy.php
index e053c028..29366ad6 100644
--- a/tests/Database/Model/registration/RegisterTaxonomyTest.php
+++ b/tests/database/model/registration/test-register-taxonomy.php
@@ -6,7 +6,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mockery as m;
 
-class RegisterTaxonomyTest extends Framework_Test_Case {
+class Test_Register_Taxonomy extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		remove_all_actions( 'init' );
diff --git a/tests/Database/Model/relations/BelongsToOneOrManyTest.php b/tests/database/model/relations/test-belongs-to-one-or-many.php
similarity index 98%
rename from tests/Database/Model/relations/BelongsToOneOrManyTest.php
rename to tests/database/model/relations/test-belongs-to-one-or-many.php
index e58c866f..8b96f577 100644
--- a/tests/Database/Model/relations/BelongsToOneOrManyTest.php
+++ b/tests/database/model/relations/test-belongs-to-one-or-many.php
@@ -11,7 +11,7 @@
 use Mantle\Database\Model\Term;
 use Mantle\Database\Model_Service_Provider;
 
-class BelongsToOneOrManyTest extends Framework_Test_Case {
+class Test_Belongs_To_One_Or_Many extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Database/Model/relations/HasOneOrManyTest.php b/tests/database/model/relations/test-has-one-or-many.php
similarity index 99%
rename from tests/Database/Model/relations/HasOneOrManyTest.php
rename to tests/database/model/relations/test-has-one-or-many.php
index c8dd0054..223ad9a8 100644
--- a/tests/Database/Model/relations/HasOneOrManyTest.php
+++ b/tests/database/model/relations/test-has-one-or-many.php
@@ -12,7 +12,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class HasOneOrManyTest extends Framework_Test_Case {
+class Test_Has_One_Or_Many extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/Database/Model/AttachmentTest.php b/tests/database/model/test-attachment.php
similarity index 93%
rename from tests/Database/Model/AttachmentTest.php
rename to tests/database/model/test-attachment.php
index ed9d15b3..78d479f7 100644
--- a/tests/Database/Model/AttachmentTest.php
+++ b/tests/database/model/test-attachment.php
@@ -4,7 +4,7 @@
 use Mantle\Database\Model\Attachment;
 use Mantle\Testing\Framework_Test_Case;
 
-class AttachmentTest extends Framework_Test_Case {
+class Test_Attachment extends Framework_Test_Case {
 	/**
 	 * @var int
 	 */
diff --git a/tests/Database/Model/CommentObjectTest.php b/tests/database/model/test-comment-object.php
similarity index 97%
rename from tests/Database/Model/CommentObjectTest.php
rename to tests/database/model/test-comment-object.php
index 185ac08e..c5161fb1 100644
--- a/tests/Database/Model/CommentObjectTest.php
+++ b/tests/database/model/test-comment-object.php
@@ -5,7 +5,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class CommentObjectTest extends Framework_Test_Case {
+class Test_Comment_Object extends Framework_Test_Case {
 	public function test_comment_object() {
 		$comment = $this->factory->comment->create_and_get();
 		$object  = Comment::find( $comment );
diff --git a/tests/Database/Model/ModelScopeTest.php b/tests/database/model/test-model-scope.php
similarity index 98%
rename from tests/Database/Model/ModelScopeTest.php
rename to tests/database/model/test-model-scope.php
index 06b60458..8986932b 100644
--- a/tests/Database/Model/ModelScopeTest.php
+++ b/tests/database/model/test-model-scope.php
@@ -9,7 +9,7 @@
 use Mantle\Database\Query\Post_Query_Builder;
 use Mantle\Testing\Framework_Test_Case;
 
-class ModelScopeTest extends Framework_Test_Case {
+class Test_Model_Scope extends Framework_Test_Case {
 	public function test_local_scope() {
 		$post_id = $this->get_random_post_id();
 
diff --git a/tests/Database/Model/ModelTest.php b/tests/database/model/test-model.php
similarity index 99%
rename from tests/Database/Model/ModelTest.php
rename to tests/database/model/test-model.php
index f0ac5b15..1a830b35 100644
--- a/tests/Database/Model/ModelTest.php
+++ b/tests/database/model/test-model.php
@@ -9,7 +9,7 @@
 /**
  * Test non-WordPress specific logic of the model
  */
-class ModelTest extends Framework_Test_Case {
+class Test_Model extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Database/Model/PermalinkGeneratorTest.php b/tests/database/model/test-permalink-generator.php
similarity index 94%
rename from tests/Database/Model/PermalinkGeneratorTest.php
rename to tests/database/model/test-permalink-generator.php
index 92b9892c..9481b04e 100644
--- a/tests/Database/Model/PermalinkGeneratorTest.php
+++ b/tests/database/model/test-permalink-generator.php
@@ -5,7 +5,7 @@
 use Mantle\Database\Model\Post;
 use Mantle\Testing\Framework_Test_Case;
 
-class PermalinkGeneratorTest extends Framework_Test_Case {
+class Test_Permalink_Generator extends Framework_Test_Case {
 	public function test_generate_permalink() {
 		$post  = static::factory()->post->create_and_get();
 		$model = Testable_Post_Generator::find( $post->ID );
diff --git a/tests/Database/Model/PostModelEventsTest.php b/tests/database/model/test-post-model-events.php
similarity index 98%
rename from tests/Database/Model/PostModelEventsTest.php
rename to tests/database/model/test-post-model-events.php
index 72b73674..f78a3eb7 100644
--- a/tests/Database/Model/PostModelEventsTest.php
+++ b/tests/database/model/test-post-model-events.php
@@ -7,7 +7,7 @@
 /**
  * Test non-WordPress specific logic of the model
  */
-class PostModelEventsTest extends Framework_Test_Case {
+class Test_Post_Model_Events extends Framework_Test_Case {
 	public function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Database/Model/PostObjectTest.php b/tests/database/model/test-post-object.php
similarity index 99%
rename from tests/Database/Model/PostObjectTest.php
rename to tests/database/model/test-post-object.php
index 9becccce..6ecc6a01 100644
--- a/tests/Database/Model/PostObjectTest.php
+++ b/tests/database/model/test-post-object.php
@@ -10,7 +10,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class PostObjectTest extends Framework_Test_Case {
+class Test_Post_Object extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/Database/Model/RestFieldTest.php b/tests/database/model/test-rest-field.php
similarity index 93%
rename from tests/Database/Model/RestFieldTest.php
rename to tests/database/model/test-rest-field.php
index ca8b5536..6a0aa92f 100644
--- a/tests/Database/Model/RestFieldTest.php
+++ b/tests/database/model/test-rest-field.php
@@ -5,7 +5,7 @@
 use Mantle\Database\Model\Registration\Register_Rest_Fields;
 use Mantle\Testing\Framework_Test_Case;
 
-class RestFieldTest extends Framework_Test_Case {
+class Test_Rest_Field extends Framework_Test_Case {
 	public function test_rest_field() {
 		Testable_Model_With_Rest_Field::boot_if_not_booted();
 
diff --git a/tests/Database/Model/SiteObjectTest.php b/tests/database/model/test-site-object.php
similarity index 94%
rename from tests/Database/Model/SiteObjectTest.php
rename to tests/database/model/test-site-object.php
index e58c26d6..00537b04 100644
--- a/tests/Database/Model/SiteObjectTest.php
+++ b/tests/database/model/test-site-object.php
@@ -6,7 +6,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class SiteObjectTest extends Framework_Test_Case {
+class Test_Site_Object extends Framework_Test_Case {
 	use Multisite_Test;
 
 	public function test_site_attributes() {
diff --git a/tests/Database/Model/TermModelEventsTest.php b/tests/database/model/test-term-model-events.php
similarity index 98%
rename from tests/Database/Model/TermModelEventsTest.php
rename to tests/database/model/test-term-model-events.php
index e5496388..42b4d69e 100644
--- a/tests/Database/Model/TermModelEventsTest.php
+++ b/tests/database/model/test-term-model-events.php
@@ -7,7 +7,7 @@
 /**
  * Test non-WordPress specific logic of the model
  */
-class TermModelEventsTest extends Framework_Test_Case {
+class Test_Term_Model_Events extends Framework_Test_Case {
 	public function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Database/Model/TermObjectTest.php b/tests/database/model/test-term-object.php
similarity index 98%
rename from tests/Database/Model/TermObjectTest.php
rename to tests/database/model/test-term-object.php
index 0aac358b..d8c127d1 100644
--- a/tests/Database/Model/TermObjectTest.php
+++ b/tests/database/model/test-term-object.php
@@ -8,7 +8,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class TermObjectTest extends Framework_Test_Case {
+class Test_Term_Object extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		Example_Taxonomy::register_object();
diff --git a/tests/Database/Model/UserObjectTest.php b/tests/database/model/test-user-object.php
similarity index 97%
rename from tests/Database/Model/UserObjectTest.php
rename to tests/database/model/test-user-object.php
index 07bcfa5c..41935e03 100644
--- a/tests/Database/Model/UserObjectTest.php
+++ b/tests/database/model/test-user-object.php
@@ -5,7 +5,7 @@
 use Mantle\Database\Model\User;
 use Mantle\Testing\Framework_Test_Case;
 
-class UserObjectTest extends Framework_Test_Case {
+class Test_User_Object extends Framework_Test_Case {
 	/**
 	 * @var Factory
 	 */
diff --git a/tests/Database/Query/EagerLoadRelationshipsTest.php b/tests/database/query/test-eager-load-relationships.php
similarity index 99%
rename from tests/Database/Query/EagerLoadRelationshipsTest.php
rename to tests/database/query/test-eager-load-relationships.php
index 9d458f56..52d52d8a 100644
--- a/tests/Database/Query/EagerLoadRelationshipsTest.php
+++ b/tests/database/query/test-eager-load-relationships.php
@@ -9,7 +9,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class EagerLoadRelationshipsTest extends Framework_Test_Case {
+class Test_Eager_Load_Relationships extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/Database/Query/PaginatorTest.php b/tests/database/query/test-paginator.php
similarity index 99%
rename from tests/Database/Query/PaginatorTest.php
rename to tests/database/query/test-paginator.php
index 0f415c0f..dcafc0f3 100644
--- a/tests/Database/Query/PaginatorTest.php
+++ b/tests/database/query/test-paginator.php
@@ -7,7 +7,7 @@
 use Mantle\Testing\Framework_Test_Case;
 
 
-class PaginatorTest extends Framework_Test_Case {
+class Test_Paginator extends Framework_Test_Case {
 	use Refresh_Database;
 
 	public function test_simple_paginate_url_query_string() {
diff --git a/tests/Database/Query/PostQueryBuilderTest.php b/tests/database/query/test-post-query-builder.php
similarity index 99%
rename from tests/Database/Query/PostQueryBuilderTest.php
rename to tests/database/query/test-post-query-builder.php
index 4e52448c..73c0ba32 100644
--- a/tests/Database/Query/PostQueryBuilderTest.php
+++ b/tests/database/query/test-post-query-builder.php
@@ -13,7 +13,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class PostQueryBuilderTest extends Framework_Test_Case {
+class Test_Post_Query_Builder extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/Database/Query/PostQueryRelationshipsTest.php b/tests/database/query/test-post-query-relationships.php
similarity index 97%
rename from tests/Database/Query/PostQueryRelationshipsTest.php
rename to tests/database/query/test-post-query-relationships.php
index ffc156c4..6c91ed95 100644
--- a/tests/Database/Query/PostQueryRelationshipsTest.php
+++ b/tests/database/query/test-post-query-relationships.php
@@ -9,7 +9,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class PostQueryRelationshipsTest extends Framework_Test_Case {
+class Test_Post_Query_Relationships extends Framework_Test_Case {
 	protected function setUp(): void {
 		Utils::delete_all_posts();
 		parent::setUp();
diff --git a/tests/Database/Query/TermQueryBuilderTest.php b/tests/database/query/test-term-query-builder.php
similarity index 98%
rename from tests/Database/Query/TermQueryBuilderTest.php
rename to tests/database/query/test-term-query-builder.php
index 406f2df0..5dbcf0e6 100644
--- a/tests/Database/Query/TermQueryBuilderTest.php
+++ b/tests/database/query/test-term-query-builder.php
@@ -7,7 +7,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class TermQueryBuilderTest extends Framework_Test_Case {
+class Test_Term_Query_Builder extends Framework_Test_Case {
 	public function test_term_by_name() {
 		$tag_id = $this->get_random_term_id();
 		$tag    = \get_term( $tag_id );
diff --git a/tests/Events/EventDispatcherTest.php b/tests/events/test-event-dispatcher.php
similarity index 97%
rename from tests/Events/EventDispatcherTest.php
rename to tests/events/test-event-dispatcher.php
index de5a9077..3133fd54 100644
--- a/tests/Events/EventDispatcherTest.php
+++ b/tests/events/test-event-dispatcher.php
@@ -8,7 +8,7 @@
 /**
  * @group events
  */
-class EventDispatcherTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Event_Dispatcher extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	public function testBasicEventExecution() {
 		unset( $_SERVER['__event.test'] );
 		$d = new Dispatcher();
diff --git a/tests/Events/WordPressActionDispatcherTest.php b/tests/events/test-wordpress-action-dispatcher.php
similarity index 98%
rename from tests/Events/WordPressActionDispatcherTest.php
rename to tests/events/test-wordpress-action-dispatcher.php
index b23ea070..297e0cea 100644
--- a/tests/Events/WordPressActionDispatcherTest.php
+++ b/tests/events/test-wordpress-action-dispatcher.php
@@ -12,7 +12,7 @@
 /**
  * @group events
  */
-class WordPressActionDispatcherTest extends Framework_Test_Case {
+class Test_WordPress_Action_Dispatcher extends Framework_Test_Case {
 	public function test_action_handler() {
 		$_SERVER['__action_fired'] = false;
 
diff --git a/tests/Filesystem/FilesystemAdapterTest.php b/tests/filesystem/test-filesystem-adapter.php
similarity index 98%
rename from tests/Filesystem/FilesystemAdapterTest.php
rename to tests/filesystem/test-filesystem-adapter.php
index a790fc65..45b12337 100644
--- a/tests/Filesystem/FilesystemAdapterTest.php
+++ b/tests/filesystem/test-filesystem-adapter.php
@@ -15,7 +15,7 @@
 use Mockery as m;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
-class FilesystemAdapterTest extends TestCase {
+class Test_Filesystem_Adapter extends TestCase {
 	private $temp_dir;
 
 	/**
@@ -137,7 +137,7 @@ public function testDelete() {
 		file_put_contents( $this->temp_dir . '/file.txt', 'Hello World' );
 		$Filesystem_Adapter = new Filesystem_Adapter( $this->filesystem );
 		$this->assertTrue( $Filesystem_Adapter->delete( 'file.txt' ) );
-		$this->assertFileDoesNotExist( $this->temp_dir . '/file.txt' );
+		Assert::assertFileDoesNotExist( $this->temp_dir . '/file.txt' );
 	}
 
 	public function testDeleteReturnsFalseWhenFileNotFound() {
@@ -168,7 +168,7 @@ public function testMove() {
 		$Filesystem_Adapter = new Filesystem_Adapter( $this->filesystem );
 		$Filesystem_Adapter->move( '/foo/foo.txt', '/foo/foo2.txt' );
 
-		$this->assertFileDoesNotExist( $this->temp_dir . '/foo/foo.txt' );
+		Assert::assertFileDoesNotExist( $this->temp_dir . '/foo/foo.txt' );
 
 		$this->assertFileExists( $this->temp_dir . '/foo/foo2.txt' );
 		$this->assertEquals( $data, file_get_contents( $this->temp_dir . '/foo/foo2.txt' ) );
diff --git a/tests/Filesystem/FilesystemManagerTest.php b/tests/filesystem/test-filesystem-manager.php
similarity index 97%
rename from tests/Filesystem/FilesystemManagerTest.php
rename to tests/filesystem/test-filesystem-manager.php
index 0eef4382..1ef4988f 100644
--- a/tests/Filesystem/FilesystemManagerTest.php
+++ b/tests/filesystem/test-filesystem-manager.php
@@ -10,7 +10,7 @@
 use Mantle\Contracts\Filesystem\Filesystem as Filesystem_Contract;
 use function Mantle\Support\Helpers\tap;
 
-class FilesystemManagerTest extends TestCase {
+class Test_Filesystem_Manager extends TestCase {
 	public function test_invalid_disk() {
 		$this->expectException( InvalidArgumentException::class );
 		$this->expectExceptionMessage( 'Disk [unsupported] does not have a configured driver.' );
diff --git a/tests/Filesystem/FilesystemTest.php b/tests/filesystem/test-filesystem.php
similarity index 67%
rename from tests/Filesystem/FilesystemTest.php
rename to tests/filesystem/test-filesystem.php
index e54cb081..b97a8326 100644
--- a/tests/Filesystem/FilesystemTest.php
+++ b/tests/filesystem/test-filesystem.php
@@ -9,7 +9,7 @@
 use SplFileInfo;
 use League\Flysystem\FileNotFoundException;
 
-class FilesystemTest extends TestCase {
+class Test_Filesystem extends TestCase {
 
 	private static $temp_dir;
 
@@ -43,13 +43,13 @@ protected function tearDown(): void {
 	public function testGetRetrievesFiles() {
 		file_put_contents( static::$temp_dir . '/file.txt', 'Hello World' );
 		$files = new Filesystem();
-		$this->assertSame( 'Hello World', $files->get( static::$temp_dir . '/file.txt' ) );
+		Assert::assertSame( 'Hello World', $files->get( static::$temp_dir . '/file.txt' ) );
 	}
 
 	public function testPutStoresFiles() {
 		$files = new Filesystem();
 		$files->put( static::$temp_dir . '/file.txt', 'Hello World' );
-		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
+		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
 	}
 
 	public function testReplaceCreatesFile() {
@@ -58,7 +58,7 @@ public function testReplaceCreatesFile() {
 		$filesystem = new Filesystem();
 
 		$filesystem->replace( $tempFile, 'Hello World' );
-		$this->assertStringEqualsFile( $tempFile, 'Hello World' );
+		Assert::assertStringEqualsFile( $tempFile, 'Hello World' );
 	}
 
 	public function testReplaceWhenUnixSymlinkExists() {
@@ -80,18 +80,18 @@ public function testReplaceWhenUnixSymlinkExists() {
 
 		// Test replacing non-existent file.
 		$filesystem->replace( $tempFile, 'Hello World' );
-		$this->assertStringEqualsFile( $tempFile, 'Hello World' );
-		$this->assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
+		Assert::assertStringEqualsFile( $tempFile, 'Hello World' );
+		Assert::assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
 
 		// Test replacing existing file.
 		$filesystem->replace( $tempFile, 'Something Else' );
-		$this->assertStringEqualsFile( $tempFile, 'Something Else' );
-		$this->assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
+		Assert::assertStringEqualsFile( $tempFile, 'Something Else' );
+		Assert::assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
 
 		// Test replacing symlinked file.
 		$filesystem->replace( $symlink, 'Yet Something Else Again' );
-		$this->assertStringEqualsFile( $tempFile, 'Yet Something Else Again' );
-		$this->assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
+		Assert::assertStringEqualsFile( $tempFile, 'Yet Something Else Again' );
+		Assert::assertEquals( $umask, 0777 - $this->get_file_permissions( $tempFile ) );
 
 		umask( $originalUmask );
 
@@ -105,7 +105,7 @@ public function testSetChmod() {
 		$files->chmod( static::$temp_dir . '/file.txt', 0755 );
 		$filePermission      = substr( sprintf( '%o', fileperms( static::$temp_dir . '/file.txt' ) ), -4 );
 		$expectedPermissions = DIRECTORY_SEPARATOR == '\\' ? '0666' : '0755';
-		$this->assertEquals( $expectedPermissions, $filePermission );
+		Assert::assertEquals( $expectedPermissions, $filePermission );
 	}
 
 	public function testGetChmod() {
@@ -115,7 +115,7 @@ public function testGetChmod() {
 		$files               = new Filesystem();
 		$filePermission      = $files->chmod( static::$temp_dir . '/file.txt' );
 		$expectedPermissions = DIRECTORY_SEPARATOR == '\\' ? '0666' : '0755';
-		$this->assertEquals( $expectedPermissions, $filePermission );
+		Assert::assertEquals( $expectedPermissions, $filePermission );
 	}
 
 	public function testDeleteRemovesFiles() {
@@ -125,29 +125,29 @@ public function testDeleteRemovesFiles() {
 
 		$files = new Filesystem();
 		$files->delete( static::$temp_dir . '/file1.txt' );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/file1.txt' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/file1.txt' );
 
 		$files->delete( [ static::$temp_dir . '/file2.txt', static::$temp_dir . '/file3.txt' ] );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/file2.txt' );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/file3.txt' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/file2.txt' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/file3.txt' );
 	}
 
 	public function testPrependExistingFiles() {
 		$files = new Filesystem();
 		$files->put( static::$temp_dir . '/file.txt', 'World' );
 		$files->prepend( static::$temp_dir . '/file.txt', 'Hello ' );
-		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
+		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
 	}
 
 	public function testPrependNewFiles() {
 		$files = new Filesystem();
 		$files->prepend( static::$temp_dir . '/file.txt', 'Hello World' );
-		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
+		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'Hello World' );
 	}
 
 	public function testMissingFile() {
 		$files = new Filesystem();
-		$this->assertTrue( $files->missing( static::$temp_dir . '/file.txt' ) );
+		Assert::assertTrue( $files->missing( static::$temp_dir . '/file.txt' ) );
 	}
 
 	public function testDeleteDirectory() {
@@ -155,15 +155,15 @@ public function testDeleteDirectory() {
 		file_put_contents( static::$temp_dir . '/foo/file.txt', 'Hello World' );
 		$files = new Filesystem();
 		$files->delete_directory( static::$temp_dir . '/foo' );
-		$this->assertDirectoryDoesNotExist( static::$temp_dir . '/foo' );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/foo/file.txt' );
+		Assert::assertDirectoryDoesNotExist( static::$temp_dir . '/foo' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/foo/file.txt' );
 	}
 
 	public function testDeleteDirectoryReturnFalseWhenNotADirectory() {
 		mkdir( static::$temp_dir . '/bar' );
 		file_put_contents( static::$temp_dir . '/bar/file.txt', 'Hello World' );
 		$files = new Filesystem();
-		$this->assertFalse( $files->delete_directory( static::$temp_dir . '/bar/file.txt' ) );
+		Assert::assertFalse( $files->delete_directory( static::$temp_dir . '/bar/file.txt' ) );
 	}
 
 	public function testCleanDirectory() {
@@ -171,8 +171,8 @@ public function testCleanDirectory() {
 		file_put_contents( static::$temp_dir . '/baz/file.txt', 'Hello World' );
 		$files = new Filesystem();
 		$files->clean_directory( static::$temp_dir . '/baz' );
-		$this->assertDirectoryExists( static::$temp_dir . '/baz' );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/baz/file.txt' );
+		Assert::assertDirectoryExists( static::$temp_dir . '/baz' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/baz/file.txt' );
 	}
 
 	public function testMacro() {
@@ -185,7 +185,7 @@ function () use ( $files, $temp_dir ) {
 				return $files->get( $temp_dir . '/foo.txt' );
 			}
 		);
-		$this->assertSame( 'Hello World', $files->getFoo() );
+		Assert::assertSame( 'Hello World', $files->getFoo() );
 	}
 
 	public function testFilesMethod() {
@@ -195,14 +195,14 @@ public function testFilesMethod() {
 		mkdir( static::$temp_dir . '/views/_layouts' );
 		$files   = new Filesystem();
 		$results = $files->files( static::$temp_dir . '/views' );
-		$this->assertInstanceOf( SplFileInfo::class, $results[0] );
-		$this->assertInstanceOf( SplFileInfo::class, $results[1] );
+		Assert::assertInstanceOf( SplFileInfo::class, $results[0] );
+		Assert::assertInstanceOf( SplFileInfo::class, $results[1] );
 		unset( $files );
 	}
 
 	public function testCopyDirectoryReturnsFalseIfSourceIsntDirectory() {
 		$files = new Filesystem();
-		$this->assertFalse( $files->copy_directory( static::$temp_dir . '/breeze/boom/foo/bar/baz', static::$temp_dir ) );
+		Assert::assertFalse( $files->copy_directory( static::$temp_dir . '/breeze/boom/foo/bar/baz', static::$temp_dir ) );
 	}
 
 	public function testCopyDirectoryMovesEntireDirectory() {
@@ -214,11 +214,11 @@ public function testCopyDirectoryMovesEntireDirectory() {
 
 		$files = new Filesystem();
 		$files->copy_directory( static::$temp_dir . '/tmp', static::$temp_dir . '/tmp2' );
-		$this->assertDirectoryExists( static::$temp_dir . '/tmp2' );
-		$this->assertFileExists( static::$temp_dir . '/tmp2/foo.txt' );
-		$this->assertFileExists( static::$temp_dir . '/tmp2/bar.txt' );
-		$this->assertDirectoryExists( static::$temp_dir . '/tmp2/nested' );
-		$this->assertFileExists( static::$temp_dir . '/tmp2/nested/baz.txt' );
+		Assert::assertDirectoryExists( static::$temp_dir . '/tmp2' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp2/foo.txt' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp2/bar.txt' );
+		Assert::assertDirectoryExists( static::$temp_dir . '/tmp2/nested' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp2/nested/baz.txt' );
 	}
 
 	public function testMoveDirectoryMovesEntireDirectory() {
@@ -230,12 +230,12 @@ public function testMoveDirectoryMovesEntireDirectory() {
 
 		$files = new Filesystem();
 		$files->move_directory( static::$temp_dir . '/tmp2', static::$temp_dir . '/tmp3' );
-		$this->assertDirectoryExists( static::$temp_dir . '/tmp3' );
-		$this->assertFileExists( static::$temp_dir . '/tmp3/foo.txt' );
-		$this->assertFileExists( static::$temp_dir . '/tmp3/bar.txt' );
-		$this->assertDirectoryExists( static::$temp_dir . '/tmp3/nested' );
-		$this->assertFileExists( static::$temp_dir . '/tmp3/nested/baz.txt' );
-		$this->assertDirectoryDoesNotExist( static::$temp_dir . '/tmp2' );
+		Assert::assertDirectoryExists( static::$temp_dir . '/tmp3' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp3/foo.txt' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp3/bar.txt' );
+		Assert::assertDirectoryExists( static::$temp_dir . '/tmp3/nested' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp3/nested/baz.txt' );
+		Assert::assertDirectoryDoesNotExist( static::$temp_dir . '/tmp2' );
 	}
 
 	public function testMoveDirectoryMovesEntireDirectoryAndOverwrites() {
@@ -250,14 +250,14 @@ public function testMoveDirectoryMovesEntireDirectoryAndOverwrites() {
 
 		$files = new Filesystem();
 		$files->move_directory( static::$temp_dir . '/tmp4', static::$temp_dir . '/tmp5', true );
-		$this->assertDirectoryExists( static::$temp_dir . '/tmp5' );
-		$this->assertFileExists( static::$temp_dir . '/tmp5/foo.txt' );
-		$this->assertFileExists( static::$temp_dir . '/tmp5/bar.txt' );
-		$this->assertDirectoryExists( static::$temp_dir . '/tmp5/nested' );
-		$this->assertFileExists( static::$temp_dir . '/tmp5/nested/baz.txt' );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/tmp5/foo2.txt' );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/tmp5/bar2.txt' );
-		$this->assertDirectoryDoesNotExist( static::$temp_dir . '/tmp4' );
+		Assert::assertDirectoryExists( static::$temp_dir . '/tmp5' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp5/foo.txt' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp5/bar.txt' );
+		Assert::assertDirectoryExists( static::$temp_dir . '/tmp5/nested' );
+		Assert::assertFileExists( static::$temp_dir . '/tmp5/nested/baz.txt' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/tmp5/foo2.txt' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/tmp5/bar2.txt' );
+		Assert::assertDirectoryDoesNotExist( static::$temp_dir . '/tmp4' );
 	}
 
 	public function testMoveDirectoryReturnsFalseWhileOverwritingAndUnableToDeleteDestinationDirectory() {
@@ -267,7 +267,7 @@ public function testMoveDirectoryReturnsFalseWhileOverwritingAndUnableToDeleteDe
 
 		$files = m::mock( Filesystem::class )->makePartial();
 		$files->shouldReceive( 'delete_directory' )->once()->andReturn( false );
-		$this->assertFalse( $files->move_directory( static::$temp_dir . '/tmp6', static::$temp_dir . '/tmp7', true ) );
+		Assert::assertFalse( $files->move_directory( static::$temp_dir . '/tmp6', static::$temp_dir . '/tmp7', true ) );
 	}
 
 	public function testGetThrowsExceptionNonexisitingFile() {
@@ -280,7 +280,7 @@ public function testGetThrowsExceptionNonexisitingFile() {
 	public function testGetRequireReturnsProperly() {
 		file_put_contents( static::$temp_dir . '/file.php', '<?php return "Howdy?"; ?>' );
 		$files = new Filesystem();
-		$this->assertSame( 'Howdy?', $files->get_require( static::$temp_dir . '/file.php' ) );
+		Assert::assertSame( 'Howdy?', $files->get_require( static::$temp_dir . '/file.php' ) );
 	}
 
 	public function testGetRequireThrowsExceptionNonExistingFile() {
@@ -294,59 +294,59 @@ public function testAppendAddsDataToFile() {
 		file_put_contents( static::$temp_dir . '/file.txt', 'foo' );
 		$files        = new Filesystem();
 		$bytesWritten = $files->append( static::$temp_dir . '/file.txt', 'bar' );
-		$this->assertEquals( mb_strlen( 'bar', '8bit' ), $bytesWritten );
-		$this->assertFileExists( static::$temp_dir . '/file.txt' );
-		$this->assertStringEqualsFile( static::$temp_dir . '/file.txt', 'foobar' );
+		Assert::assertEquals( mb_strlen( 'bar', '8bit' ), $bytesWritten );
+		Assert::assertFileExists( static::$temp_dir . '/file.txt' );
+		Assert::assertStringEqualsFile( static::$temp_dir . '/file.txt', 'foobar' );
 	}
 
 	public function testMoveMovesFiles() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
 		$files->move( static::$temp_dir . '/foo.txt', static::$temp_dir . '/bar.txt' );
-		$this->assertFileExists( static::$temp_dir . '/bar.txt' );
-		$this->assertFileDoesNotExist( static::$temp_dir . '/foo.txt' );
+		Assert::assertFileExists( static::$temp_dir . '/bar.txt' );
+		Assert::assertFileDoesNotExist( static::$temp_dir . '/foo.txt' );
 	}
 
 	public function testNameReturnsName() {
 		file_put_contents( static::$temp_dir . '/foobar.txt', 'foo' );
 		$filesystem = new Filesystem();
-		$this->assertSame( 'foobar', $filesystem->name( static::$temp_dir . '/foobar.txt' ) );
+		Assert::assertSame( 'foobar', $filesystem->name( static::$temp_dir . '/foobar.txt' ) );
 	}
 
 	public function testExtensionReturnsExtension() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		$this->assertSame( 'txt', $files->extension( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertSame( 'txt', $files->extension( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testBasenameReturnsBasename() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		$this->assertSame( 'foo.txt', $files->basename( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertSame( 'foo.txt', $files->basename( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testDirnameReturnsDirectory() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		$this->assertEquals( static::$temp_dir, $files->dirname( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertEquals( static::$temp_dir, $files->dirname( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testTypeIdentifiesFile() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		$this->assertSame( 'file', $files->type( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertSame( 'file', $files->type( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testTypeIdentifiesDirectory() {
 		mkdir( static::$temp_dir . '/foo-dir' );
 		$files = new Filesystem();
-		$this->assertSame( 'dir', $files->type( static::$temp_dir . '/foo-dir' ) );
+		Assert::assertSame( 'dir', $files->type( static::$temp_dir . '/foo-dir' ) );
 	}
 
 	public function testSizeOutputsSize() {
 		$size  = file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		$this->assertEquals( $size, $files->size( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertEquals( $size, $files->size( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	/**
@@ -355,16 +355,16 @@ public function testSizeOutputsSize() {
 	public function testMimeTypeOutputsMimeType() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
-		$this->assertSame( 'text/plain', $files->mime_type( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertSame( 'text/plain', $files->mime_type( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testIsWritable() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$files = new Filesystem();
 		@chmod( static::$temp_dir . '/foo.txt', 0444 );
-		$this->assertFalse( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertFalse( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
 		@chmod( static::$temp_dir . '/foo.txt', 0777 );
-		$this->assertTrue( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertTrue( $files->is_writable( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function testIsReadable() {
@@ -372,14 +372,14 @@ public function testIsReadable() {
 		$files = new Filesystem();
 		// chmod is noneffective on Windows
 		if ( DIRECTORY_SEPARATOR === '\\' ) {
-			$this->assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
+			Assert::assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
 		} else {
 			@chmod( static::$temp_dir . '/foo.txt', 0000 );
-			$this->assertFalse( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
+			Assert::assertFalse( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
 			@chmod( static::$temp_dir . '/foo.txt', 0777 );
-			$this->assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
+			Assert::assertTrue( $files->is_readable( static::$temp_dir . '/foo.txt' ) );
 		}
-		$this->assertFalse( $files->is_readable( static::$temp_dir . '/doesnotexist.txt' ) );
+		Assert::assertFalse( $files->is_readable( static::$temp_dir . '/doesnotexist.txt' ) );
 	}
 
 	public function testGlobFindsFiles() {
@@ -387,8 +387,8 @@ public function testGlobFindsFiles() {
 		file_put_contents( static::$temp_dir . '/bar.txt', 'bar' );
 		$files = new Filesystem();
 		$glob  = $files->glob( static::$temp_dir . '/*.txt' );
-		$this->assertContains( static::$temp_dir . '/foo.txt', $glob );
-		$this->assertContains( static::$temp_dir . '/bar.txt', $glob );
+		Assert::assertContains( static::$temp_dir . '/foo.txt', $glob );
+		Assert::assertContains( static::$temp_dir . '/bar.txt', $glob );
 	}
 
 	public function testAllFilesFindsFiles() {
@@ -399,8 +399,8 @@ public function testAllFilesFindsFiles() {
 		foreach ( $files->all_files( static::$temp_dir ) as $file ) {
 			$allFiles[] = $file->getFilename();
 		}
-		$this->assertContains( 'foo.txt', $allFiles );
-		$this->assertContains( 'bar.txt', $allFiles );
+		Assert::assertContains( 'foo.txt', $allFiles );
+		Assert::assertContains( 'bar.txt', $allFiles );
 	}
 
 	public function testDirectoriesFindsDirectories() {
@@ -408,14 +408,14 @@ public function testDirectoriesFindsDirectories() {
 		mkdir( static::$temp_dir . '/music' );
 		$files       = new Filesystem();
 		$directories = $files->directories( static::$temp_dir );
-		$this->assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'film', $directories );
-		$this->assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'music', $directories );
+		Assert::assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'film', $directories );
+		Assert::assertContains( static::$temp_dir . DIRECTORY_SEPARATOR . 'music', $directories );
 	}
 
 	public function testMakeDirectory() {
 		$files = new Filesystem();
-		$this->assertTrue( $files->make_directory( static::$temp_dir . '/created' ) );
-		$this->assertFileExists( static::$temp_dir . '/created' );
+		Assert::assertTrue( $files->make_directory( static::$temp_dir . '/created' ) );
+		Assert::assertFileExists( static::$temp_dir . '/created' );
 	}
 
 	public function testRequireOnceRequiresFileProperly() {
@@ -425,8 +425,8 @@ public function testRequireOnceRequiresFileProperly() {
 		$filesystem->require_once( static::$temp_dir . '/scripts/foo.php' );
 		file_put_contents( static::$temp_dir . '/scripts/foo.php', '<?php function random_function_xyz_changed(){};' );
 		$filesystem->require_once( static::$temp_dir . '/scripts/foo.php' );
-		$this->assertTrue( function_exists( 'random_function_xyz' ) );
-		$this->assertFalse( function_exists( 'random_function_xyz_changed' ) );
+		Assert::assertTrue( function_exists( 'random_function_xyz' ) );
+		Assert::assertFalse( function_exists( 'random_function_xyz_changed' ) );
 	}
 
 	public function testCopyCopiesFileProperly() {
@@ -435,16 +435,16 @@ public function testCopyCopiesFileProperly() {
 		mkdir( static::$temp_dir . '/text' );
 		file_put_contents( static::$temp_dir . '/text/foo.txt', $data );
 		$filesystem->copy( static::$temp_dir . '/text/foo.txt', static::$temp_dir . '/text/foo2.txt' );
-		$this->assertFileExists( static::$temp_dir . '/text/foo2.txt' );
-		$this->assertEquals( $data, file_get_contents( static::$temp_dir . '/text/foo2.txt' ) );
+		Assert::assertFileExists( static::$temp_dir . '/text/foo2.txt' );
+		Assert::assertEquals( $data, file_get_contents( static::$temp_dir . '/text/foo2.txt' ) );
 	}
 
 	public function testIsFileChecksFilesProperly() {
 		$filesystem = new Filesystem();
 		mkdir( static::$temp_dir . '/help' );
 		file_put_contents( static::$temp_dir . '/help/foo.txt', 'contents' );
-		$this->assertTrue( $filesystem->is_file( static::$temp_dir . '/help/foo.txt' ) );
-		$this->assertFalse( $filesystem->is_file( static::$temp_dir . './help' ) );
+		Assert::assertTrue( $filesystem->is_file( static::$temp_dir . '/help/foo.txt' ) );
+		Assert::assertFalse( $filesystem->is_file( static::$temp_dir . './help' ) );
 	}
 
 	public function testFilesMethodReturnsFileInfoObjects() {
@@ -453,7 +453,7 @@ public function testFilesMethodReturnsFileInfoObjects() {
 		file_put_contents( static::$temp_dir . '/objects/2.txt', '2' );
 		mkdir( static::$temp_dir . '/objects/bar' );
 		$files = new Filesystem();
-		$this->assertContainsOnlyInstancesOf( SplFileInfo::class, $files->files( static::$temp_dir . '/objects' ) );
+		Assert::assertContainsOnlyInstancesOf( SplFileInfo::class, $files->files( static::$temp_dir . '/objects' ) );
 		unset( $files );
 	}
 
@@ -461,13 +461,13 @@ public function testAllFilesReturnsFileInfoObjects() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		file_put_contents( static::$temp_dir . '/bar.txt', 'bar' );
 		$files = new Filesystem();
-		$this->assertContainsOnlyInstancesOf( SplFileInfo::class, $files->all_files( static::$temp_dir ) );
+		Assert::assertContainsOnlyInstancesOf( SplFileInfo::class, $files->all_files( static::$temp_dir ) );
 	}
 
 	public function testHash() {
 		file_put_contents( static::$temp_dir . '/foo.txt', 'foo' );
 		$filesystem = new Filesystem();
-		$this->assertSame( 'acbd18db4cc2f85cedef654fccc4a4d8', $filesystem->hash( static::$temp_dir . '/foo.txt' ) );
+		Assert::assertSame( 'acbd18db4cc2f85cedef654fccc4a4d8', $filesystem->hash( static::$temp_dir . '/foo.txt' ) );
 	}
 
 	public function test_guess_class_name() {
diff --git a/tests/framework/blocks/fixtures/blocks/class-mock-block.php b/tests/framework/blocks/fixtures/blocks/class-mock-block.php
new file mode 100644
index 00000000..eaac44be
--- /dev/null
+++ b/tests/framework/blocks/fixtures/blocks/class-mock-block.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * An Example block class
+ * @package Mantle
+ * @subpackage Tests
+ */
+
+namespace Mantle\Tests\Framework\Blocks\Fixtures\Blocks;
+
+use Mantle\Contracts\Block;
+
+class Mock_Block implements Block {
+	/**
+	 * Number of times this block has been registered.
+	 */
+	public static int $registrations = 0;
+
+	public function register(): void {
+		self::$registrations++;
+	}
+}
diff --git a/tests/framework/blocks/fixtures/dummy/class-example-block.php b/tests/framework/blocks/fixtures/dummy/class-example-block.php
new file mode 100644
index 00000000..08faf28b
--- /dev/null
+++ b/tests/framework/blocks/fixtures/dummy/class-example-block.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * An Example block class
+ * @package Mantle
+ * @subpackage Tests
+ */
+
+namespace Mantle\Tests\Framework\Blocks\Fixtures\Dummy;
+
+use Mantle\Contracts\Block;
+
+class Example_Block implements Block {
+	public function register(): void {
+
+	}
+}
diff --git a/tests/framework/blocks/test-block-provider.php b/tests/framework/blocks/test-block-provider.php
new file mode 100644
index 00000000..72927f28
--- /dev/null
+++ b/tests/framework/blocks/test-block-provider.php
@@ -0,0 +1,76 @@
+<?php
+namespace Mantle\Tests\Framework\Tests;
+
+use Mantle\Application\Application;
+use Mantle\Blocks\Discover_Blocks;
+use Mantle\Blocks\Block_Service_Provider;
+use Mantle\Support\Environment;
+use Mantle\Testing\Framework_Test_Case;
+use Mantle\Tests\Framework\Blocks\Fixtures\Blocks\Mock_Block;
+use Mantle\Tests\Framework\Blocks\Fixtures\Dummy\Example_Block;
+use Mockery as m;
+
+class Test_Block_Provider extends Framework_Test_Case {
+	protected function setUp(): void {
+		parent::setUp();
+
+		// Mock a true Mantle application.
+		$this->app->set_app_path( dirname( __DIR__, 2 ) );
+
+		$this->app['config']->set( 'app.namespace', 'Mantle\\Tests' );
+	}
+
+	protected function tearDown(): void {
+		$this->app['config']->set( 'app.namespace', 'App' );
+		$this->app->set_app_path( $this->app->get_base_path( 'app' ) );
+
+		parent::tearDown();
+	}
+
+	/**
+	 * Verify that the Discover_Blocks::within method returns the expected
+	 * array of block class names.
+	 */
+	public function testBlocksAreFound() {
+		$this->assertEquals( 'Mantle\\Tests', $this->app->get_namespace() );
+
+		$expected = [
+			Example_Block::class,
+		];
+
+		$found_blocks = Discover_Blocks::within(
+			__DIR__ . '/fixtures/dummy',
+			getcwd(),
+		);
+
+		$this->assertSame( $expected, $found_blocks );
+	}
+
+	/**
+	 * Verify that the Block Service Provider locates, and registers, blocks
+	 * as expected.
+	 */
+	public function testBlockProviderRegistersBlocks() {
+		$expected = 1;
+
+		/**
+		 * First we need to configure the test application so it will find the blocks
+		 * inside of our fixtures folder, and load them as if this were the Mantle app.
+		 */
+		$app = m::mock( Application::class )->makePartial();
+		$app->set_base_path( getcwd() );
+		$app->set_app_path( __DIR__ . '/fixtures' );
+
+		$app['config'] = $this->app['config'];
+
+		$this->assertEquals( 'Mantle\\Tests', $app->get_namespace() );
+
+		/**
+		 * Now we need to boot our test application.
+		 */
+		$app->register( Block_Service_Provider::class );
+		$app->boot();
+
+		$this->assertSame( $expected, Mock_Block::$registrations );
+	}
+}
diff --git a/tests/Framework/Events/fixtures/events/class-event-one.php b/tests/framework/events/fixtures/events/class-event-one.php
similarity index 100%
rename from tests/Framework/Events/fixtures/events/class-event-one.php
rename to tests/framework/events/fixtures/events/class-event-one.php
diff --git a/tests/Framework/Events/fixtures/events/class-event-two.php b/tests/framework/events/fixtures/events/class-event-two.php
similarity index 100%
rename from tests/Framework/Events/fixtures/events/class-event-two.php
rename to tests/framework/events/fixtures/events/class-event-two.php
diff --git a/tests/Framework/Events/fixtures/listeners/class-example-listener.php b/tests/framework/events/fixtures/listeners/class-example-listener.php
similarity index 100%
rename from tests/Framework/Events/fixtures/listeners/class-example-listener.php
rename to tests/framework/events/fixtures/listeners/class-example-listener.php
diff --git a/tests/Framework/Events/DiscoverEventsTest.php b/tests/framework/events/test-discover-events.php
similarity index 88%
rename from tests/Framework/Events/DiscoverEventsTest.php
rename to tests/framework/events/test-discover-events.php
index f98e1f1f..5b477963 100644
--- a/tests/Framework/Events/DiscoverEventsTest.php
+++ b/tests/framework/events/test-discover-events.php
@@ -10,17 +10,13 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class DiscoverEventsTest extends Framework_Test_Case {
+class Test_Discover_Events extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
 		// Mock a true Mantle application.
 		$this->app['config']->set( 'app.namespace', 'Mantle\\Tests' );
 		$this->app->set_app_path( dirname( __DIR__, 2 ) );
-
-		require_once __DIR__ . '/fixtures/listeners/class-example-listener.php';
-		require_once __DIR__ . '/fixtures/events/class-event-one.php';
-		require_once __DIR__ . '/fixtures/events/class-event-two.php';
 	}
 
 	protected function tearDown(): void {
diff --git a/tests/Framework/Helpers/NullableCommentObjectsTestCaseTest.php b/tests/framework/helpers/test-nullable-comment-objects-test-case.php
similarity index 93%
rename from tests/Framework/Helpers/NullableCommentObjectsTestCaseTest.php
rename to tests/framework/helpers/test-nullable-comment-objects-test-case.php
index da959488..df799067 100644
--- a/tests/Framework/Helpers/NullableCommentObjectsTestCaseTest.php
+++ b/tests/framework/helpers/test-nullable-comment-objects-test-case.php
@@ -14,7 +14,7 @@
 /**
  * Unit tests for nullable comment object functions.
  */
-class NullableCommentObjectsTestCaseTest extends Framework_Test_Case {
+class Nullable_Comment_Objects_Test_Case extends Framework_Test_Case {
 	/**
 	 * Test that `get_comment_object()` returns a comment object.
 	 */
diff --git a/tests/Framework/Helpers/NullablePostObjectsTestCaseTest.php b/tests/framework/helpers/test-nullable-post-objects-test-case.php
similarity index 95%
rename from tests/Framework/Helpers/NullablePostObjectsTestCaseTest.php
rename to tests/framework/helpers/test-nullable-post-objects-test-case.php
index c8178fc7..f96a7098 100644
--- a/tests/Framework/Helpers/NullablePostObjectsTestCaseTest.php
+++ b/tests/framework/helpers/test-nullable-post-objects-test-case.php
@@ -13,7 +13,7 @@
 /**
  * Unit tests for nullable post object functions.
  */
-class NullablePostObjectsTestCaseTest extends Framework_Test_Case {
+class Nullable_Post_Objects_Test_Case extends Framework_Test_Case {
 	/**
 	 * Test that `get_post_object()` returns a post object.
 	 */
diff --git a/tests/framework/helpers/test-nullable-site-objects-test-case.php b/tests/framework/helpers/test-nullable-site-objects-test-case.php
new file mode 100644
index 00000000..7f805d5e
--- /dev/null
+++ b/tests/framework/helpers/test-nullable-site-objects-test-case.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Class file for Nullable_Site_Objects_Test_Case
+ *
+ * @package Mantle
+ */
+
+namespace Mantle\Tests\Framework\Helpers;
+
+use Mantle\Testing\Framework_Test_Case;
+use function Mantle\Support\Helpers\get_site_object;
+
+if ( \is_multisite() ) {
+	/**
+	 * Unit tests for nullable site object functions.
+	 */
+	class Nullable_Site_Objects_Test_Case extends Framework_Test_Case {
+		/**
+		 * Test that `get_site_object()` returns a site object.
+		 */
+		public function test_site_object_returns_site() {
+			$known_id = self::factory()->blog->create();
+
+			$found_object = get_site_object( $known_id );
+
+			$this->assertInstanceOf( \WP_Site::class, $found_object );
+
+			$this->assertSame( $known_id, (int) $found_object->blog_id );
+		}
+
+		/**
+		 * Test that `get_site_object()` returns null when there is no site.
+		 */
+		public function test_site_object_returns_null() {
+			$found_object = get_site_object( -99 );
+
+			$this->assertNull( $found_object );
+		}
+	}
+}
diff --git a/tests/Framework/Helpers/NullableTermObjectsTestCaseTest.php b/tests/framework/helpers/test-nullable-term-objects-test-case.php
similarity index 98%
rename from tests/Framework/Helpers/NullableTermObjectsTestCaseTest.php
rename to tests/framework/helpers/test-nullable-term-objects-test-case.php
index f1834776..1e7c0493 100644
--- a/tests/Framework/Helpers/NullableTermObjectsTestCaseTest.php
+++ b/tests/framework/helpers/test-nullable-term-objects-test-case.php
@@ -14,7 +14,7 @@
 /**
  * Unit tests for nullable term object functions.
  */
-class NullableTermObjectsTestCaseTest extends Framework_Test_Case {
+class Nullable_Term_Objects_Test_Case extends Framework_Test_Case {
 	/**
 	 * Test that `get_term_object()` returns a term object.
 	 */
diff --git a/tests/Framework/Helpers/NullableUserObjectsTestCaseTest.php b/tests/framework/helpers/test-nullable-user-objects-test-case.php
similarity index 95%
rename from tests/Framework/Helpers/NullableUserObjectsTestCaseTest.php
rename to tests/framework/helpers/test-nullable-user-objects-test-case.php
index 6ecaeb4b..49447ab0 100644
--- a/tests/Framework/Helpers/NullableUserObjectsTestCaseTest.php
+++ b/tests/framework/helpers/test-nullable-user-objects-test-case.php
@@ -14,7 +14,7 @@
 /**
  * Unit tests for nullable user object functions.
  */
-class NullableUserObjectsTestCaseTest extends Framework_Test_Case {
+class Nullable_User_Objects_Test_Case extends Framework_Test_Case {
 	/**
 	 * Test that `get_user_object()` returns a user object.
 	 */
diff --git a/tests/Framework/AliasLoaderTest.php b/tests/framework/test-alias-loader.php
similarity index 97%
rename from tests/Framework/AliasLoaderTest.php
rename to tests/framework/test-alias-loader.php
index c108cb3c..f2c0596a 100644
--- a/tests/Framework/AliasLoaderTest.php
+++ b/tests/framework/test-alias-loader.php
@@ -5,7 +5,7 @@
 use Mantle\Framework\Alias_Loader;
 use PHPUnit\Framework\TestCase;
 
-class AliasLoaderTest extends TestCase {
+class Test_Alias_Loader extends TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Framework/ApplicationTest.php b/tests/framework/test-application.php
similarity index 98%
rename from tests/Framework/ApplicationTest.php
rename to tests/framework/test-application.php
index 2a2260ef..b8f8c764 100644
--- a/tests/Framework/ApplicationTest.php
+++ b/tests/framework/test-application.php
@@ -7,7 +7,7 @@
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-class ApplicationTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Application extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	protected function tearDown(): void {
 		parent::tearDown();
 
diff --git a/tests/Framework/BootloaderTest.php b/tests/framework/test-bootloader.php
similarity index 98%
rename from tests/Framework/BootloaderTest.php
rename to tests/framework/test-bootloader.php
index 7855df92..c860405a 100644
--- a/tests/Framework/BootloaderTest.php
+++ b/tests/framework/test-bootloader.php
@@ -9,7 +9,7 @@
 use Mantle\Testing\Concerns\Interacts_With_Hooks;
 use PHPUnit\Framework\TestCase;
 
-class BootloaderTest extends TestCase {
+class Test_Bootloader extends TestCase {
 	use Interacts_With_Hooks;
 
 	public function setUp(): void {
diff --git a/tests/Framework/IsolatedFrameworkTest.php b/tests/framework/test-isolated-framework.php
similarity index 95%
rename from tests/Framework/IsolatedFrameworkTest.php
rename to tests/framework/test-isolated-framework.php
index 67347330..ccda175a 100644
--- a/tests/Framework/IsolatedFrameworkTest.php
+++ b/tests/framework/test-isolated-framework.php
@@ -11,7 +11,7 @@
  * Designed to test the application in complete isolation for use outside of a
  * mantle-based application.
  */
-class IsolatedFrameworkTest extends TestCase {
+class Test_Isolated_Framework extends TestCase {
 	public Application $app;
 
 	protected function setUp(): void {
diff --git a/tests/Framework/PipelineTest.php b/tests/framework/test-pipeline.php
similarity index 100%
rename from tests/Framework/PipelineTest.php
rename to tests/framework/test-pipeline.php
diff --git a/tests/Helpers/HelpersArrayTest.php b/tests/helpers/test-helpers-array.php
similarity index 99%
rename from tests/Helpers/HelpersArrayTest.php
rename to tests/helpers/test-helpers-array.php
index ffea296c..9cefe50f 100644
--- a/tests/Helpers/HelpersArrayTest.php
+++ b/tests/helpers/test-helpers-array.php
@@ -6,7 +6,7 @@
 use function Mantle\Support\Helpers\data_set;
 use function Mantle\Support\Helpers\value;
 
-class HelpersArrayTest extends TestCase {
+class SupportHelpersArrayTest extends TestCase {
 	public function testValue() {
 		$this->assertSame( 'foo', value( 'foo' ) );
 		$this->assertSame( 'foo', value( function () {
diff --git a/tests/Helpers/HelpersGeneralTest.php b/tests/helpers/test-helpers-general.php
similarity index 98%
rename from tests/Helpers/HelpersGeneralTest.php
rename to tests/helpers/test-helpers-general.php
index b010cb76..449f830b 100644
--- a/tests/Helpers/HelpersGeneralTest.php
+++ b/tests/helpers/test-helpers-general.php
@@ -19,7 +19,7 @@
 use function Mantle\Support\Helpers\transform;
 use function Mantle\Support\Helpers\with;
 
-class HelpersGeneralTest extends TestCase {
+class SupportHelpersGeneralTest extends TestCase {
 	public function testClassBasename() {
 		$this->assertSame( 'Baz', class_basename( 'Foo\Bar\Baz' ) );
 		$this->assertSame( 'Baz', class_basename( 'Baz' ) );
@@ -178,7 +178,7 @@ public function testWith() {
 		} ) );
 	}
 
-	public static function providesPregReplaceArrayData() {
+	public function providesPregReplaceArrayData() {
 		$pointerArray = [ 'Taylor', 'Otwell' ];
 
 		next( $pointerArray );
diff --git a/tests/Helpers/HelpersTest.php b/tests/helpers/test-helpers.php
similarity index 98%
rename from tests/Helpers/HelpersTest.php
rename to tests/helpers/test-helpers.php
index 72fd9e52..69d9dca0 100644
--- a/tests/Helpers/HelpersTest.php
+++ b/tests/helpers/test-helpers.php
@@ -15,7 +15,7 @@
 use function Mantle\Support\Helpers\is_local_env;
 use function Mantle\Support\Helpers\logger;
 
-class HelpersTest extends TestCase {
+class Test_Helpers extends TestCase {
 	protected Application $app;
 	protected Log_Manager $instance;
 	protected TestHandler $handler;
diff --git a/tests/HttpClient/HttpClientTest.php b/tests/http-client/test-http-client.php
similarity index 99%
rename from tests/HttpClient/HttpClientTest.php
rename to tests/http-client/test-http-client.php
index 3a3cd9bb..9a2642ce 100644
--- a/tests/HttpClient/HttpClientTest.php
+++ b/tests/http-client/test-http-client.php
@@ -18,7 +18,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Mock_Http_Response;
 
-class HttpClientTest extends Framework_Test_Case {
+class Test_Http_Client extends Framework_Test_Case {
 	protected Factory $http_factory;
 
 	protected function setUp(): void {
diff --git a/tests/Http/Routing/PostModelRoutingTest.php b/tests/http/routing/test-post-model-routing.php
similarity index 97%
rename from tests/Http/Routing/PostModelRoutingTest.php
rename to tests/http/routing/test-post-model-routing.php
index 01b29443..35cf7c2d 100644
--- a/tests/Http/Routing/PostModelRoutingTest.php
+++ b/tests/http/routing/test-post-model-routing.php
@@ -11,7 +11,7 @@
 use Mantle\Http\Routing\Middleware\Wrap_Template;
 use Mantle\Testing\Framework_Test_Case;
 
-class PostModelRoutingTest extends Framework_Test_Case {
+class Test_Post_Model_Routing extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Http/Routing/RestApiRoutingTest.php b/tests/http/routing/test-rest-api-routing.php
similarity index 98%
rename from tests/Http/Routing/RestApiRoutingTest.php
rename to tests/http/routing/test-rest-api-routing.php
index fcae6ab1..ffcabb3e 100644
--- a/tests/Http/Routing/RestApiRoutingTest.php
+++ b/tests/http/routing/test-rest-api-routing.php
@@ -9,7 +9,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use WP_REST_Request;
 
-class RestApiRoutingTest extends Framework_Test_Case {
+class Test_REST_API_Routing extends Framework_Test_Case {
 	use Refresh_Database;
 
 	public function test_generic_route() {
diff --git a/tests/Http/Routing/TermModelRoutingTest.php b/tests/http/routing/test-term-model-routing.php
similarity index 98%
rename from tests/Http/Routing/TermModelRoutingTest.php
rename to tests/http/routing/test-term-model-routing.php
index af327a47..2d880034 100644
--- a/tests/Http/Routing/TermModelRoutingTest.php
+++ b/tests/http/routing/test-term-model-routing.php
@@ -14,7 +14,7 @@
 use Mantle\Http\Routing\Middleware\Wrap_Template;
 use Mantle\Testing\Framework_Test_Case;
 
-class TermModelRoutingTest extends Framework_Test_Case {
+class Test_Term_Model_Routing extends Framework_Test_Case {
 	public function test_category_term() {
 		Testable_Category_Model::boot_if_not_booted();
 
diff --git a/tests/Http/ControllerTest.php b/tests/http/test-controller.php
similarity index 97%
rename from tests/Http/ControllerTest.php
rename to tests/http/test-controller.php
index 9a48bfeb..12b8112c 100644
--- a/tests/Http/ControllerTest.php
+++ b/tests/http/test-controller.php
@@ -13,7 +13,7 @@
 use Mantle\Http\Request;
 use Mantle\Testing\Framework_Test_Case;
 
-class ControllerTest extends Framework_Test_Case {
+class Test_Controller extends Framework_Test_Case {
 	public function test_controller_at_method() {
 		Route::get( '/example-controller-at-route', Example_Controller::class . '@example_method' );
 
diff --git a/tests/Http/RedirectorTest.php b/tests/http/test-redirector.php
similarity index 98%
rename from tests/Http/RedirectorTest.php
rename to tests/http/test-redirector.php
index cbe063e1..6309b8ed 100644
--- a/tests/Http/RedirectorTest.php
+++ b/tests/http/test-redirector.php
@@ -14,7 +14,7 @@
 use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
-class RedirectorTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Redirector extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 
 	/**
 	 * @var Request
diff --git a/tests/Http/ResponseFactoryTest.php b/tests/http/test-response-factory.php
similarity index 93%
rename from tests/Http/ResponseFactoryTest.php
rename to tests/http/test-response-factory.php
index 7d3f73a2..b036e1e0 100644
--- a/tests/Http/ResponseFactoryTest.php
+++ b/tests/http/test-response-factory.php
@@ -9,7 +9,7 @@
 
 use Mantle\Http\Request;
 
-class ResponseFactoryTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Response_Factory extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 
 	public function setUp(): void {
 		parent::setUp();
diff --git a/tests/Http/RouterTest.php b/tests/http/test-router.php
similarity index 99%
rename from tests/Http/RouterTest.php
rename to tests/http/test-router.php
index c7600bb3..54634ba5 100644
--- a/tests/Http/RouterTest.php
+++ b/tests/http/test-router.php
@@ -10,7 +10,7 @@
 use Mantle\Http\Routing\Router;
 use Mantle\Testing\Framework_Test_Case;
 
-class RouterTest extends Framework_Test_Case {
+class Test_Router extends Framework_Test_Case {
 	public function test_basic_dispatching() {
 		$router = $this->get_router();
 		$router->get(
diff --git a/tests/Http/UploadedFileTest.php b/tests/http/test-uploaded-file.php
similarity index 94%
rename from tests/Http/UploadedFileTest.php
rename to tests/http/test-uploaded-file.php
index 07931b70..16659197 100644
--- a/tests/Http/UploadedFileTest.php
+++ b/tests/http/test-uploaded-file.php
@@ -6,7 +6,7 @@
 use Mantle\Http\Uploaded_File;
 use Mantle\Testing\Framework_Test_Case;
 
-class UploadedFileTest extends Framework_Test_Case {
+class Test_Uploaded_File extends Framework_Test_Case {
 
 	public function testUploadedFileCanRetrieveContentsFromTextFile() {
 		$file = new Uploaded_File(
diff --git a/tests/Http/UrlGeneratorTest.php b/tests/http/test-url-generator.php
similarity index 98%
rename from tests/Http/UrlGeneratorTest.php
rename to tests/http/test-url-generator.php
index 76ede318..3c993700 100644
--- a/tests/Http/UrlGeneratorTest.php
+++ b/tests/http/test-url-generator.php
@@ -11,7 +11,7 @@
 use Mantle\Http\Routing\Url_Generator;
 use Mantle\Testing\Framework_Test_Case;
 
-class UrlGeneratorTest extends Framework_Test_Case {
+class Test_Url_Generator extends Framework_Test_Case {
 	protected Router $router;
 
 	protected Url_Generator $url;
diff --git a/tests/Log/LogManagerTest.php b/tests/log/test-log-manager.php
similarity index 97%
rename from tests/Log/LogManagerTest.php
rename to tests/log/test-log-manager.php
index 4d4bc4f2..bad4cf3d 100644
--- a/tests/Log/LogManagerTest.php
+++ b/tests/log/test-log-manager.php
@@ -8,7 +8,7 @@
 use Mantle\Log\Log_Manager;
 use Monolog\Handler\TestHandler;
 
-class LogManagerTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Log_Manager extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 
 	/**
 	 * @var Application
diff --git a/tests/Queue/providers/WordPressCronQueueTest.php b/tests/queue/providers/test-wordpress-cron-queue.php
similarity index 98%
rename from tests/Queue/providers/WordPressCronQueueTest.php
rename to tests/queue/providers/test-wordpress-cron-queue.php
index 9676ccf8..93fa00d4 100644
--- a/tests/Queue/providers/WordPressCronQueueTest.php
+++ b/tests/queue/providers/test-wordpress-cron-queue.php
@@ -21,7 +21,7 @@
  * @group queue
  * @group wordpress-queue
  */
-class WordPressCronQueueTest extends Framework_Test_Case {
+class Test_WordPress_Cron_Queue extends Framework_Test_Case {
 	use Refresh_Database;
 
 	protected function setUp(): void {
diff --git a/tests/Queue/DispatcherTest.php b/tests/queue/test-dispatcher.php
similarity index 96%
rename from tests/Queue/DispatcherTest.php
rename to tests/queue/test-dispatcher.php
index 745193b2..2d8d5a91 100644
--- a/tests/Queue/DispatcherTest.php
+++ b/tests/queue/test-dispatcher.php
@@ -16,7 +16,7 @@
 /**
  * @group queue
  */
-class DispatcherTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Dispatcher extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	/**
 	 * Provider instance.
 	 *
diff --git a/tests/Queue/QueueManagerTest.php b/tests/queue/test-queue-manager.php
similarity index 94%
rename from tests/Queue/QueueManagerTest.php
rename to tests/queue/test-queue-manager.php
index 6975357a..9eab6995 100644
--- a/tests/Queue/QueueManagerTest.php
+++ b/tests/queue/test-queue-manager.php
@@ -10,7 +10,7 @@
 /**
  * @group queue
  */
-class QueueManagerTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Queue_Manager extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	public function test_default_connection() {
 		$provider = m::mock( Provider::class );
 
diff --git a/tests/Queue/WorkerTest.php b/tests/queue/test-worker.php
similarity index 98%
rename from tests/Queue/WorkerTest.php
rename to tests/queue/test-worker.php
index 1d5d426f..909c9970 100644
--- a/tests/Queue/WorkerTest.php
+++ b/tests/queue/test-worker.php
@@ -18,7 +18,7 @@
 /**
  * @group queue
  */
-class WorkerTest extends MockeryTestCase {
+class Test_Worker extends MockeryTestCase {
 
 	/**
 	 * Application instance.
diff --git a/tests/Scheduling/EventTest.php b/tests/scheduling/test-event.php
similarity index 97%
rename from tests/Scheduling/EventTest.php
rename to tests/scheduling/test-event.php
index 9a949020..15163e9d 100644
--- a/tests/Scheduling/EventTest.php
+++ b/tests/scheduling/test-event.php
@@ -8,7 +8,7 @@
 use Mantle\Testing\Mock_Http_Response;
 use Mockery as m;
 
-class EventTest extends Framework_Test_Case {
+class Test_Event extends Framework_Test_Case {
 	protected function tearDown(): void {
 		parent::tearDown();
 
diff --git a/tests/Scheduling/FrequencyTest.php b/tests/scheduling/test-frequency.php
similarity index 98%
rename from tests/Scheduling/FrequencyTest.php
rename to tests/scheduling/test-frequency.php
index 172adf57..4dbc3c0a 100644
--- a/tests/Scheduling/FrequencyTest.php
+++ b/tests/scheduling/test-frequency.php
@@ -6,7 +6,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mockery as m;
 
-class FrequencyTest extends Framework_Test_Case {
+class Test_Frequency extends Framework_Test_Case {
 
 	/*
 	 * @var Event
diff --git a/tests/Support/Providers/ModelRegisterProviderTest.php b/tests/support/providers/test-model-register-provider.php
similarity index 94%
rename from tests/Support/Providers/ModelRegisterProviderTest.php
rename to tests/support/providers/test-model-register-provider.php
index 163be978..1eb246bd 100644
--- a/tests/Support/Providers/ModelRegisterProviderTest.php
+++ b/tests/support/providers/test-model-register-provider.php
@@ -11,7 +11,7 @@
 use Mockery as m;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class ModelRegisterProviderTest extends MockeryTestCase {
+class Test_Model_Service_Provider extends MockeryTestCase {
 	protected function setUp(): void {
 		parent::setUp();
 		remove_all_actions( 'init' );
diff --git a/tests/Support/ArrTest.php b/tests/support/test-arr.php
similarity index 99%
rename from tests/Support/ArrTest.php
rename to tests/support/test-arr.php
index b0b2b092..8cdd7521 100644
--- a/tests/Support/ArrTest.php
+++ b/tests/support/test-arr.php
@@ -10,7 +10,7 @@
 use PHPUnit\Framework\TestCase;
 use stdClass;
 
-class ArrTest extends TestCase {
+class Test_Arr extends TestCase {
 
 	public function testAccessible() {
 		$this->assertTrue( Arr::accessible( [] ) );
diff --git a/tests/Support/CollectionTest.php b/tests/support/test-collection.php
similarity index 99%
rename from tests/Support/CollectionTest.php
rename to tests/support/test-collection.php
index 76079491..1db26c81 100644
--- a/tests/Support/CollectionTest.php
+++ b/tests/support/test-collection.php
@@ -21,7 +21,7 @@
 
 use function Mantle\Support\Helpers\collect;
 
-class CollectionTest extends Framework_Test_Case {
+class Test_Collection extends Framework_Test_Case {
 	/**
 	 * @dataProvider collectionClassProvider
 	 */
@@ -320,7 +320,7 @@ public function testJsonSerializeCallsToArrayOrJsonSerializeOnEachItemInCollecti
 	 */
 	public function testToJsonEncodesTheJsonSerializeResult($collection)
 	{
-		$c = $this->getMockBuilder($collection)->onlyMethods(['jsonSerialize'])->getMock();
+		$c = $this->getMockBuilder($collection)->setMethods(['jsonSerialize'])->getMock();
 		$c->expects($this->once())->method('jsonSerialize')->willReturn('foo');
 		$results = $c->to_json();
 		$this->assertJsonStringEqualsJsonString(json_encode('foo'), $results);
@@ -331,7 +331,7 @@ public function testToJsonEncodesTheJsonSerializeResult($collection)
 	 */
 	public function testCastingToStringJsonEncodesTheToArrayResult($collection)
 	{
-		$c = $this->getMockBuilder($collection)->onlyMethods(['jsonSerialize'])->getMock();
+		$c = $this->getMockBuilder($collection)->setMethods(['jsonSerialize'])->getMock();
 		$c->expects($this->once())->method('jsonSerialize')->willReturn('foo');
 
 		$this->assertJsonStringEqualsJsonString(json_encode('foo'), (string) $c);
@@ -4336,7 +4336,7 @@ public function test_from_fallback( $collection ) {
 	 *
 	 * @return array
 	 */
-	public static function collectionClassProvider()
+	public function collectionClassProvider()
 	{
 		return [
 			[Collection::class],
diff --git a/tests/Support/EnvironmentTest.php b/tests/support/test-environment.php
similarity index 94%
rename from tests/Support/EnvironmentTest.php
rename to tests/support/test-environment.php
index 04379194..1afb034f 100644
--- a/tests/Support/EnvironmentTest.php
+++ b/tests/support/test-environment.php
@@ -5,7 +5,7 @@
 use Mantle\Support\Environment;
 use Mantle\Testing\Framework_Test_Case;
 
-class EnvironmentTest extends Framework_Test_Case {
+class Test_Environment extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 		Environment::clear();
diff --git a/tests/Support/ForwardCallsTest.php b/tests/support/test-forward-calls.php
similarity index 98%
rename from tests/Support/ForwardCallsTest.php
rename to tests/support/test-forward-calls.php
index ee7d6094..8ff8d366 100644
--- a/tests/Support/ForwardCallsTest.php
+++ b/tests/support/test-forward-calls.php
@@ -7,7 +7,7 @@
 use Mantle\Support\Forward_Calls;
 use PHPUnit\Framework\TestCase;
 
-class ForwardCallsTest extends TestCase {
+class Forward_CallsTest extends TestCase {
 
 	public function testForward_Calls() {
 		$results = ( new Forward_CallsOne() )->forwardedTwo( 'foo', 'bar' );
diff --git a/tests/Support/PluralizerTest.php b/tests/support/test-pluralizer.php
similarity index 99%
rename from tests/Support/PluralizerTest.php
rename to tests/support/test-pluralizer.php
index 787bb1b0..78c6fbfa 100755
--- a/tests/Support/PluralizerTest.php
+++ b/tests/support/test-pluralizer.php
@@ -5,7 +5,7 @@
 use Mantle\Support\Str;
 use PHPUnit\Framework\TestCase;
 
-class PluralizerTest extends TestCase {
+class Test_Pluralizer extends TestCase {
 
 	public function testBasicSingular() {
 		$this->assertSame( 'child', Str::singular( 'children' ) );
diff --git a/tests/Support/ServiceProviderTest.php b/tests/support/test-service-provider.php
similarity index 99%
rename from tests/Support/ServiceProviderTest.php
rename to tests/support/test-service-provider.php
index 9b325be6..8b42d9c8 100644
--- a/tests/Support/ServiceProviderTest.php
+++ b/tests/support/test-service-provider.php
@@ -9,7 +9,7 @@
 use Mantle\Support\Attributes\Action;
 use Mockery as m;
 
-class ServiceProviderTest extends \Mockery\Adapter\Phpunit\MockeryTestCase {
+class Test_Service_Provider extends \Mockery\Adapter\Phpunit\MockeryTestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Support/StrTest.php b/tests/support/test-str.php
similarity index 99%
rename from tests/Support/StrTest.php
rename to tests/support/test-str.php
index 2fd1b1d4..d0349f5b 100644
--- a/tests/Support/StrTest.php
+++ b/tests/support/test-str.php
@@ -8,7 +8,7 @@
 use Ramsey\Uuid\UuidInterface;
 use ReflectionClass;
 
-class StrTest extends TestCase {
+class Test_Str extends TestCase {
 
 	public function testStringCanBeLimitedByWords() {
 		$this->assertSame( 'Taylor...', Str::words( 'Taylor Otwell', 1 ) );
diff --git a/tests/Support/StringableTest.php b/tests/support/test-stringable.php
similarity index 99%
rename from tests/Support/StringableTest.php
rename to tests/support/test-stringable.php
index 98e9c4e2..e50565c1 100644
--- a/tests/Support/StringableTest.php
+++ b/tests/support/test-stringable.php
@@ -8,7 +8,7 @@
 use Mantle\Support\Stringable;
 use PHPUnit\Framework\TestCase;
 
-class StringableTest extends TestCase {
+class Test_Stringable extends TestCase {
 
 	/**
 	 * @param  string $string
diff --git a/tests/FakerTest.php b/tests/test-faker.php
similarity index 96%
rename from tests/FakerTest.php
rename to tests/test-faker.php
index ce37c605..daf2cf2f 100644
--- a/tests/FakerTest.php
+++ b/tests/test-faker.php
@@ -4,7 +4,7 @@
 use Faker\Factory;
 use Mantle\Faker\Faker_Provider;
 
-class FakerTest extends \PHPUnit\Framework\TestCase {
+class Test_Faker extends \PHPUnit\Framework\TestCase {
 	/**
 	 * @var Factory
 	 */
diff --git a/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot__1.yml b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot__1.yml
similarity index 100%
rename from tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot__1.yml
rename to tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot__1.yml
diff --git a/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http__1.html b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html
similarity index 100%
rename from tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http__1.html
rename to tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http__1.html
diff --git a/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http_partial__1.html b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html
similarity index 100%
rename from tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_http_partial__1.html
rename to tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_http_partial__1.html
diff --git a/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__1.json b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__1.json
similarity index 100%
rename from tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__1.json
rename to tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__1.json
diff --git a/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__2.json b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__2.json
similarity index 100%
rename from tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__2.json
rename to tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__2.json
diff --git a/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__3.json b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__3.json
similarity index 100%
rename from tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_match_snapshot_rest__3.json
rename to tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_match_snapshot_rest__3.json
diff --git a/tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_multiple_requests__1.yml b/tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_multiple_requests__1.yml
similarity index 100%
rename from tests/Testing/Concerns/__snapshots__/MakesHttpRequestsTest__test_multiple_requests__1.yml
rename to tests/testing/concerns/__snapshots__/Test_Makes_Http_Requests__test_multiple_requests__1.yml
diff --git a/tests/Testing/Concerns/BlockAssertionsTest.php b/tests/testing/concerns/test-block-assertions.php
similarity index 95%
rename from tests/Testing/Concerns/BlockAssertionsTest.php
rename to tests/testing/concerns/test-block-assertions.php
index dbd157a3..97a8805a 100644
--- a/tests/Testing/Concerns/BlockAssertionsTest.php
+++ b/tests/testing/concerns/test-block-assertions.php
@@ -8,7 +8,7 @@
 /**
  * @group testing
  */
-class BlockAssertionsTest extends Framework_Test_Case {
+class Test_Block_Assertions extends Framework_Test_Case {
 	use With_Faker;
 
 	protected WP_Post $post;
diff --git a/tests/Testing/Concerns/DeprecationsTest.php b/tests/testing/concerns/test-deprecations.php
similarity index 96%
rename from tests/Testing/Concerns/DeprecationsTest.php
rename to tests/testing/concerns/test-deprecations.php
index fc09d842..44298b51 100644
--- a/tests/Testing/Concerns/DeprecationsTest.php
+++ b/tests/testing/concerns/test-deprecations.php
@@ -8,7 +8,7 @@
  *
  * @group testing
  */
-class DeprecationsTest extends Framework_Test_Case {
+class Test_Deprecations extends Framework_Test_Case {
 	/**
 	 * @expectedDeprecated test_deprecation_annotation
 	 */
diff --git a/tests/Testing/Concerns/ElementAssertionsTest.php b/tests/testing/concerns/test-element-assertions.php
similarity index 96%
rename from tests/Testing/Concerns/ElementAssertionsTest.php
rename to tests/testing/concerns/test-element-assertions.php
index 4c55dedb..deda4c49 100644
--- a/tests/Testing/Concerns/ElementAssertionsTest.php
+++ b/tests/testing/concerns/test-element-assertions.php
@@ -7,7 +7,7 @@
 /**
  * @group testing
  */
-class ElementAssertionsTest extends Framework_Test_Case {
+class Test_Element_Assertions extends Framework_Test_Case {
 	public string $test_content = '
 	<div>
 		<section>Example Section</section>
diff --git a/tests/Testing/Concerns/IncorrectUsageTest.php b/tests/testing/concerns/test-incorrect-usage.php
similarity index 96%
rename from tests/Testing/Concerns/IncorrectUsageTest.php
rename to tests/testing/concerns/test-incorrect-usage.php
index 156701de..214f7821 100644
--- a/tests/Testing/Concerns/IncorrectUsageTest.php
+++ b/tests/testing/concerns/test-incorrect-usage.php
@@ -8,7 +8,7 @@
  *
  * @group testing
  */
-class IncorrectUsageTest extends Framework_Test_Case {
+class Test_Incorrect_Usage extends Framework_Test_Case {
 	/**
 	 * @expectedIncorrectUsage test_incorrect_usage_annotation
 	 */
diff --git a/tests/Testing/Concerns/InteractsWithConsoleTest.php b/tests/testing/concerns/test-interacts-with-console.php
similarity index 93%
rename from tests/Testing/Concerns/InteractsWithConsoleTest.php
rename to tests/testing/concerns/test-interacts-with-console.php
index d19a1796..f1d8061d 100644
--- a/tests/Testing/Concerns/InteractsWithConsoleTest.php
+++ b/tests/testing/concerns/test-interacts-with-console.php
@@ -1,5 +1,5 @@
 <?php
-namespace Mantle\Tests\Concerns;
+namespace Mantle\Testing\Concerns;
 
 use Mantle\Facade\Console;
 use Mantle\Testing\Framework_Test_Case;
@@ -7,7 +7,7 @@
 /**
  * @group testing
  */
-class InteractsWithConsoleTest extends Framework_Test_Case {
+class Test_Interacts_With_Console extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Testing/Concerns/InteractsWithExternalRequestsTest.php b/tests/testing/concerns/test-interacts-with-external-requests.php
similarity index 99%
rename from tests/Testing/Concerns/InteractsWithExternalRequestsTest.php
rename to tests/testing/concerns/test-interacts-with-external-requests.php
index 44b4863d..fb655fc7 100644
--- a/tests/Testing/Concerns/InteractsWithExternalRequestsTest.php
+++ b/tests/testing/concerns/test-interacts-with-external-requests.php
@@ -17,7 +17,7 @@
  *
  * @group testing
  */
-class InteractsWithExternalRequestsTest extends Framework_Test_Case {
+class Test_Interacts_With_External_Requests extends Framework_Test_Case {
 	use Prevent_Remote_Requests;
 
 	public function test_fake_request() {
diff --git a/tests/Testing/Concerns/InteractsWithHooksTest.php b/tests/testing/concerns/test-interacts-with-hooks.php
similarity index 98%
rename from tests/Testing/Concerns/InteractsWithHooksTest.php
rename to tests/testing/concerns/test-interacts-with-hooks.php
index bdf435cd..2447a3fc 100644
--- a/tests/Testing/Concerns/InteractsWithHooksTest.php
+++ b/tests/testing/concerns/test-interacts-with-hooks.php
@@ -6,7 +6,7 @@
 /**
  * @group testing
  */
-class InteractsWithHooksTest extends Framework_Test_Case {
+class Test_Interacts_With_Hooks extends Framework_Test_Case {
 	public function test_hook_applied() {
 		$this->assertHookNotApplied( 'hook_to_check' );
 		$this->assertHookNotApplied( 'filter_to_check' );
diff --git a/tests/Testing/Concerns/MakesHttpRequestsTest.php b/tests/testing/concerns/test-makes-http-requests.php
similarity index 99%
rename from tests/Testing/Concerns/MakesHttpRequestsTest.php
rename to tests/testing/concerns/test-makes-http-requests.php
index 5dc1b83e..1afd1fc4 100644
--- a/tests/Testing/Concerns/MakesHttpRequestsTest.php
+++ b/tests/testing/concerns/test-makes-http-requests.php
@@ -17,7 +17,7 @@
 /**
  * @group testing
  */
-class MakesHttpRequestsTest extends Framework_Test_Case {
+class Test_Makes_Http_Requests extends Framework_Test_Case {
 	use Refresh_Database;
 
 	public function test_get_home() {
diff --git a/tests/Testing/Concerns/WordPressAuthenticationTest.php b/tests/testing/concerns/test-wordpress-authentication.php
similarity index 90%
rename from tests/Testing/Concerns/WordPressAuthenticationTest.php
rename to tests/testing/concerns/test-wordpress-authentication.php
index 252035ec..1db897a3 100644
--- a/tests/Testing/Concerns/WordPressAuthenticationTest.php
+++ b/tests/testing/concerns/test-wordpress-authentication.php
@@ -1,5 +1,5 @@
 <?php
-namespace Mantle\Tests\Concerns;
+namespace Mantle\Testing\Concerns;
 
 use Mantle\Console\Command;
 use Mantle\Facade\Console;
@@ -8,7 +8,7 @@
 /**
  * @group testing
  */
-class WordPressAuthenticationTest extends Framework_Test_Case {
+class Test_WordPress_Authentication extends Framework_Test_Case {
 	public function test_acting_as_role() {
 		$user = $this->acting_as( 'administrator' );
 
diff --git a/tests/Testing/CoreTestShimTest.php b/tests/testing/test-core-test-shim.php
similarity index 88%
rename from tests/Testing/CoreTestShimTest.php
rename to tests/testing/test-core-test-shim.php
index f88ffe97..d5f00950 100644
--- a/tests/Testing/CoreTestShimTest.php
+++ b/tests/testing/test-core-test-shim.php
@@ -3,7 +3,7 @@
 
 use WP_UnitTestCase;
 
-class CoreTestShimTest extends WP_UnitTestCase {
+class Test_Core_Test_Shim extends WP_UnitTestCase {
 	protected $setup_called = false;
 
 	public function set_up() {
diff --git a/tests/Testing/PermalinkStructureTest.php b/tests/testing/test-permalink-structure.php
similarity index 97%
rename from tests/Testing/PermalinkStructureTest.php
rename to tests/testing/test-permalink-structure.php
index 71306135..0d7e114f 100644
--- a/tests/Testing/PermalinkStructureTest.php
+++ b/tests/testing/test-permalink-structure.php
@@ -4,7 +4,7 @@
 use Mantle\Testing\Framework_Test_Case;
 use Mantle\Testing\Utils;
 
-class PermalinkStructureTest extends Framework_Test_Case {
+class Test_Permalink_Structure extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/Testing/WithFakerTest.php b/tests/testing/test-with-faker.php
similarity index 62%
rename from tests/Testing/WithFakerTest.php
rename to tests/testing/test-with-faker.php
index 8b950906..f08f97d6 100644
--- a/tests/Testing/WithFakerTest.php
+++ b/tests/testing/test-with-faker.php
@@ -1,11 +1,10 @@
 <?php
-namespace Mantle\Tests;
+namespace Mantle\Testing;
 
 use Faker\Generator;
 use Mantle\Testing\Concerns\With_Faker;
-use Mantle\Testing\Framework_Test_Case;
 
-class WithFakerTest extends Framework_Test_Case {
+class Test_With_Faker extends Framework_Test_Case {
 	use With_Faker;
 
 	public function test_creates_faker() {
diff --git a/tests/Testkit/Concerns/ExampleOverload.php b/tests/testkit/concerns/trait-example-overload.php
similarity index 83%
rename from tests/Testkit/Concerns/ExampleOverload.php
rename to tests/testkit/concerns/trait-example-overload.php
index ac79ce02..25f914d3 100644
--- a/tests/Testkit/Concerns/ExampleOverload.php
+++ b/tests/testkit/concerns/trait-example-overload.php
@@ -10,7 +10,7 @@
 /**
  * Validates that method overloading is working as expected.
  */
-trait ExampleOverload {
+trait Example_Overload {
 
 	/**
 	 * @var array<string> Contains the names of the methods that have been overloaded.
@@ -21,7 +21,7 @@ trait ExampleOverload {
 	 * This method should be run during the setUpBeforeClass method of
 	 * the Test_Case.
 	 */
-	public static function exampleoverload_set_up_before_class(): void {
+	public static function example_overload_set_up_before_class(): void {
 		static::$overloaded_methods[] = 'setUpBeforeClass';
 	}
 }
diff --git a/tests/Testkit/fixtures/global-functions.php b/tests/testkit/fixtures/global-functions.php
similarity index 100%
rename from tests/Testkit/fixtures/global-functions.php
rename to tests/testkit/fixtures/global-functions.php
diff --git a/tests/Testkit/TestkitInstallWordPressTest.php b/tests/testkit/test-testkit-install-wordpress.php
similarity index 92%
rename from tests/Testkit/TestkitInstallWordPressTest.php
rename to tests/testkit/test-testkit-install-wordpress.php
index 0177366a..80bdf940 100644
--- a/tests/Testkit/TestkitInstallWordPressTest.php
+++ b/tests/testkit/test-testkit-install-wordpress.php
@@ -14,7 +14,7 @@
 	$_SERVER['__mantle_after_wordpress_install']++;
 } );
 
-class TestkitInstallWordPressTest extends Test_Case {
+class Test_Testkit_Install_WordPress extends Test_Case {
 	use Installs_WordPress;
 
 	public function test_mantle_is_installed_from_trait() {
diff --git a/tests/Testkit/TestkitTestCaseTest.php b/tests/testkit/test-testkit-test-case.php
similarity index 87%
rename from tests/Testkit/TestkitTestCaseTest.php
rename to tests/testkit/test-testkit-test-case.php
index 895181be..25d71d86 100644
--- a/tests/Testkit/TestkitTestCaseTest.php
+++ b/tests/testkit/test-testkit-test-case.php
@@ -1,11 +1,11 @@
 <?php
 namespace Mantle\Tests\Testkit;
 
-use Mantle\Tests\Testkit\Concerns\ExampleOverload;
+use Mantle\Tests\Testkit\Concerns\Example_Overload;
 use Mantle\Testkit\Test_Case;
 
-class TestkitTestCaseTest extends Test_Case {
-	use ExampleOverload;
+class Test_Testkit_Test_Case extends Test_Case {
+	use Example_Overload;
 
 	public function test_create_application() {
 		$this->assertInstanceOf( \Mantle\Contracts\Application::class, $this->create_application() );
diff --git a/tests/Testkit/WithFakerTest.php b/tests/testkit/test-with-faker.php
similarity index 85%
rename from tests/Testkit/WithFakerTest.php
rename to tests/testkit/test-with-faker.php
index 05bc615e..12ec2efb 100644
--- a/tests/Testkit/WithFakerTest.php
+++ b/tests/testkit/test-with-faker.php
@@ -5,7 +5,7 @@
 use Mantle\Testing\Concerns\With_Faker;
 use Mantle\Testkit\Test_Case;
 
-class WithFakerTest extends Test_Case {
+class Test_With_Faker extends Test_Case {
 	use With_Faker;
 
 	public function test_creates_faker() {
diff --git a/tests/View/BladeViewsTest.php b/tests/view/test-blade-views.php
similarity index 93%
rename from tests/View/BladeViewsTest.php
rename to tests/view/test-blade-views.php
index 9334711f..7794fdca 100644
--- a/tests/View/BladeViewsTest.php
+++ b/tests/view/test-blade-views.php
@@ -3,7 +3,7 @@
 
 use Mantle\Testing\Framework_Test_Case;
 
-class BladeViewsTest extends Framework_Test_Case {
+class Test_Blade_Views extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/View/FileEngineTest.php b/tests/view/test-file-engine.php
similarity index 91%
rename from tests/View/FileEngineTest.php
rename to tests/view/test-file-engine.php
index e5b02393..1eb2b43e 100644
--- a/tests/View/FileEngineTest.php
+++ b/tests/view/test-file-engine.php
@@ -3,7 +3,7 @@
 
 use Mantle\Testing\Framework_Test_Case;
 
-class FileEngineTest extends Framework_Test_Case {
+class Test_File_Views extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
diff --git a/tests/View/PhpViewsTest.php b/tests/view/test-php-views.php
similarity index 99%
rename from tests/View/PhpViewsTest.php
rename to tests/view/test-php-views.php
index 9ee68f04..985855e2 100644
--- a/tests/View/PhpViewsTest.php
+++ b/tests/view/test-php-views.php
@@ -5,7 +5,7 @@
 use Mantle\Facade\View;
 use Mantle\Http\View\Factory;
 
-class PhpViewsTest extends Framework_Test_Case {
+class Test_Php_Views extends Framework_Test_Case {
 	protected Factory $view_factory;
 
 	protected function setUp(): void {
diff --git a/tests/View/ViewFinderTest.php b/tests/view/test-view-finder.php
similarity index 96%
rename from tests/View/ViewFinderTest.php
rename to tests/view/test-view-finder.php
index 655b0671..e9b98954 100644
--- a/tests/View/ViewFinderTest.php
+++ b/tests/view/test-view-finder.php
@@ -4,7 +4,7 @@
 use Mantle\Facade\View_Loader;
 use Mantle\Testing\Framework_Test_Case;
 
-class ViewFinderTest extends Framework_Test_Case {
+class Test_View_Finder extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();