Preparing for 1.0 release and PHPUnit 10

alleyinteractive · Nov 30, 2023 · 1405da1 · 1405da1
1 parent 6569ae8
commit 1405da1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":{"App\\Tests\\Feature\\ExampleTest::test_example":0.001,"App\\Tests\\Feature\\ExampleTest::test_route":0.029}}
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
   "name": "alleyinteractive/mantle",
-  "type": "project",
   "description": "A site using the Mantle framework for WordPress",
   "license": "GPL-2.0-or-later",
+  "type": "project",
   "authors": [
     {
       "name": "Alley",
@@ -11,16 +11,23 @@
   ],
   "require": {
     "alleyinteractive/composer-wordpress-autoloader": "^1.0",
-    "alleyinteractive/mantle-framework": "^0.12",
+    "alleyinteractive/mantle-framework": "^1.0",
     "fakerphp/faker": "^1.23"
   },
   "require-dev": {
     "alleyinteractive/alley-coding-standards": "^2.0",
-    "nunomaduro/collision": "^6.4",
+    "nunomaduro/collision": "^7.0",
     "phpstan/phpstan": "1.10.15",
-    "phpunit/phpunit": "^9.6.10",
+    "phpunit/phpunit": "^9.3.3 || ^10.4.2",
     "szepeviktor/phpstan-wordpress": "^1.3"
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
+  "autoload-dev": {
+    "psr-4": {
+      "App\\Tests\\": "tests/"
+    }
+  },
   "config": {
     "allow-plugins": {
       "alleyinteractive/composer-wordpress-autoloader": true,
@@ -41,8 +48,6 @@
       }
     }
   },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
   "scripts": {
     "post-autoload-dump": [
       "bin/mantle package:discover",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,15 +1,15 @@
+<?xml version="1.0"?>
 <phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	bootstrap="tests/bootstrap.php"
 	backupGlobals="false"
 	colors="true"
-	convertErrorsToExceptions="true"
-	convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true"
-	printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+	cacheDirectory=".phpunit.cache"
 >
-	<testsuites>
-		<testsuite name="general">
-			<directory prefix="test-" suffix=".php">tests</directory>
-		</testsuite>
-	</testsuites>
+  <testsuites>
+    <testsuite name="general">
+      <directory suffix="Test.php">tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/tests/trait-create-application.php → tests/CreateApplication.php b/tests/trait-create-application.php → tests/CreateApplication.php
@@ -13,7 +13,7 @@
 /**
  * Concern for creating the application instance.
  */
-trait Create_Application {
+trait CreateApplication {
 	/**
 	 * Creates the application from the application instance.
 	 *

diff --git a/tests/class-test-case.php → tests/TestCase.php b/tests/class-test-case.php → tests/TestCase.php
@@ -10,6 +10,6 @@
 /**
  * Base Test Case that each Test Case should extend.
  */
-abstract class Test_Case extends \Mantle\Testing\Test_Case {
-	use Create_Application;
+abstract class TestCase extends \Mantle\Testing\Test_Case {
+	use CreateApplication;
 }
diff --git a/tests/feature/test-example.php → tests/feature/ExampleTest.php b/tests/feature/test-example.php → tests/feature/ExampleTest.php
@@ -7,12 +7,12 @@
 
 namespace App\Tests\Feature;
 
-use App\Tests\Test_Case;
+use App\Tests\TestCase;
 
 /**
  * Base Test Case that each Test Case should extend.
  */
-class Test_Example extends Test_Case {
+class ExampleTest extends TestCase {
   public function test_example() {
     $this->assertTrue( true );
 	}