Merge branch 'main' of github.com:alleyinteractive/mantle

alleyinteractive · Feb 14, 2023 · 4d0e743 · 4d0e743
2 parents ff62a60 + 874cd2b
commit 4d0e743
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 40 deletions.
diff --git a/app/exceptions/class-handler.php b/app/exceptions/class-handler.php
@@ -7,13 +7,13 @@
 
 namespace App\Exceptions;
 
-use Mantle\Framework\Exceptions\Handler as ExceptionHandler;
+use Mantle\Framework\Exceptions\Handler as Base_Handler;
 use Throwable;
 
 /**
  * Application Error Handler
  */
-class Handler extends ExceptionHandler {
+class Handler extends Base_Handler {
 
 	/**
 	 * A list of the exception types that are not reported.

diff --git a/app/providers/class-app-service-provider.php b/app/providers/class-app-service-provider.php
@@ -7,7 +7,7 @@
 
 namespace App\Providers;
 
-use Mantle\Framework\Providers\App_Service_Provider as Service_Provider;
+use Mantle\Application\App_Service_Provider as Service_Provider;
 
 /**
  * Application Service Provider

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -6,7 +6,7 @@
  */
 
 use Mantle\Contracts;
-use Mantle\Framework\Application;
+use Mantle\Application\Application;
 
 /**
  * Instantiate the application

diff --git a/composer.json b/composer.json
@@ -6,16 +6,16 @@
   "authors": [
     {
       "name": "Alley",
-      "email": "info@alley.co"
+      "email": "mantle@alley.com"
     }
   ],
   "require": {
     "alleyinteractive/composer-wordpress-autoloader": "^1.0",
-    "alleyinteractive/mantle-framework": "^0.9",
+    "alleyinteractive/mantle-framework": "^0.10",
     "fakerphp/faker": "^1.9"
   },
   "require-dev": {
-    "alleyinteractive/alley-coding-standards": "^0.3",
+    "alleyinteractive/alley-coding-standards": "^1.0",
     "nunomaduro/collision": "^5.0",
     "phpunit/phpunit": "^9.3.3"
   },

diff --git a/config/app.php b/config/app.php
@@ -31,12 +31,11 @@
 		// Framework Providers.
 		Mantle\Filesystem\Filesystem_Service_Provider::class,
 		Mantle\Database\Factory_Service_Provider::class,
-		Mantle\Framework\Providers\Console_Service_Provider::class,
 		Mantle\Framework\Providers\Error_Service_Provider::class,
-		Mantle\Framework\Providers\Model_Service_Provider::class,
+		Mantle\Database\Model_Service_Provider::class,
 		Mantle\Queue\Queue_Service_Provider::class,
 		Mantle\Query_Monitor\Query_Monitor_Service_Provider::class,
-		Mantle\Framework\Providers\New_Relic_Service_Provider::class,
+		Mantle\New_Relic\New_Relic_Service_Provider::class,
 		Mantle\Database\Pagination\Paginator_Service_Provider::class,
 		Mantle\Cache\Cache_Service_Provider::class,
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/phpcs.xml b/phpcs.xml
@@ -21,13 +21,10 @@
 	<exclude-pattern>storage/framework/views</exclude-pattern>
 
 	<rule ref="Alley-Interactive">
-		<!-- todo: port to alley coding standards -->
 		<exclude name="PEAR.Functions.FunctionCallSignature.ContentAfterOpenBracket" />
 		<exclude name="PEAR.Functions.FunctionCallSignature.MultipleArguments" />
 		<exclude name="PEAR.Functions.FunctionCallSignature.CloseBracketLine" />
-	</rule>
-
-	<rule ref="WordPress">
+		<exclude name="PHPCompatibility.FunctionDeclarations.NewClosure.ThisFoundOutsideClass" />
 		<exclude name="WordPress.NamingConventions.ValidPostTypeSlug.NotStringLiteral" />
 	</rule>
 

diff --git a/tests/trait-create-application.php b/tests/trait-create-application.php
@@ -8,7 +8,7 @@
 namespace App\Tests;
 
 use App\Http\Kernel;
-use Mantle\Framework\Application;
+use Mantle\Application\Application;
 
 /**
  * Concern for creating the application instance.
@@ -17,7 +17,7 @@ trait Create_Application {
 	/**
 	 * Creates the application from the application instance.
 	 *
-	 * @return \Mantle\Framework\Application
+	 * @return \Mantle\Application\Application
 	 */
 	public function create_application(): \Mantle\Contracts\Application {
 		// Allow non-mantle-site usage.