Merge pull request #364 from alleyinteractive/custom-namespace

Ensure the configuration is ready before Environment
alleyinteractive · Feb 14, 2023 · d3646bb · d3646bb
2 parents e567650 + 288c295
commit d3646bb
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 20 deletions.
diff --git a/src/mantle/application/class-application.php b/src/mantle/application/class-application.php
@@ -22,6 +22,7 @@
 use Mantle\Support\Environment;
 use Mantle\Support\Service_Provider;
 use Mantle\View\View_Service_Provider;
+use RuntimeException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -591,10 +592,14 @@ public function is_environment( ...$environments ): bool {
 	 *
 	 * @return string
 	 *
-	 * @throws RuntimeException Thrown on error determining namespace.
+	 * @throws RuntimeException If the config is not set yet.
 	 */
 	public function get_namespace(): string {
-		return Environment::get( 'APP_NAMESPACE', 'App' );
+		if ( ! isset( $this['config'] ) ) {
+			throw new RuntimeException( 'Configurations not set yet.' );
+		}
+
+		return (string) $this['config']->get( 'app.namespace', 'App' );
 	}
 
 	/**

diff --git a/src/mantle/framework/console/generators/stubs/block-class.stub b/src/mantle/framework/console/generators/stubs/block-class.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Blocks;
+namespace {{ namespace }}\Blocks;
 
 use Mantle\Blocks\Block;
 use Mantle\Contracts\Block as Block_Contract;

diff --git a/src/mantle/framework/console/generators/stubs/command.stub b/src/mantle/framework/console/generators/stubs/command.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Console;
+namespace {{ namespace }}\Console;
 
 use Mantle\Console\Command;
 

diff --git a/src/mantle/framework/console/generators/stubs/controller.stub b/src/mantle/framework/console/generators/stubs/controller.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Http\Controller;
+namespace {{ namespace }}\Http\Controller;
 
 use Mantle\Http\Controller;
 

diff --git a/src/mantle/framework/console/generators/stubs/factory-post.stub b/src/mantle/framework/console/generators/stubs/factory-post.stub
@@ -7,7 +7,7 @@
 
 // phpcs:disable Squiz.Commenting.FunctionComment.MissingParamComment
 
-namespace App\Factory;
+namespace {{ namespace }}\Factory;
 
 use Faker\Generator as Faker;
 use Mantle\Support\Str;

diff --git a/src/mantle/framework/console/generators/stubs/factory-term.stub b/src/mantle/framework/console/generators/stubs/factory-term.stub
@@ -7,7 +7,7 @@
 
 // phpcs:disable Squiz.Commenting.FunctionComment.MissingParamComment
 
-namespace App\Factory;
+namespace {{ namespace }}\Factory;
 
 use Faker\Generator as Faker;
 use Mantle\Support\Str;

diff --git a/src/mantle/framework/console/generators/stubs/generator.stub b/src/mantle/framework/console/generators/stubs/generator.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Console\Generators;
+namespace {{ namespace }}\Console\Generators;
 
 use Mantle\Framework\Console\Generators\Stub_Generator_Command;
 

diff --git a/src/mantle/framework/console/generators/stubs/job.stub b/src/mantle/framework/console/generators/stubs/job.stub
@@ -5,7 +5,7 @@
  * @package Mantle
  */
 
-namespace App\Jobs;
+namespace {{ namespace }}\Jobs;
 
 use Mantle\Contracts\Queue\Can_Queue;
 use Mantle\Contracts\Queue\Job;

diff --git a/src/mantle/framework/console/generators/stubs/middleware.stub b/src/mantle/framework/console/generators/stubs/middleware.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Http\Middleware;
+namespace {{ namespace }}\Http\Middleware;
 
 use Closure;
 

diff --git a/src/mantle/framework/console/generators/stubs/model-post-registrable.stub b/src/mantle/framework/console/generators/stubs/model-post-registrable.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Models;
+namespace {{ namespace }}\Models;
 
 use Mantle\Contracts\Database\Registrable;
 use Mantle\Database\Model\Post;

diff --git a/src/mantle/framework/console/generators/stubs/model-post.stub b/src/mantle/framework/console/generators/stubs/model-post.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Models;
+namespace {{ namespace }}\Models;
 
 use Mantle\Database\Model\Post;
 

diff --git a/src/mantle/framework/console/generators/stubs/model-term-registrable.stub b/src/mantle/framework/console/generators/stubs/model-term-registrable.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Models;
+namespace {{ namespace }}\Models;
 
 use Mantle\Contracts\Database\Registrable;
 use Mantle\Database\Model\Term;

diff --git a/src/mantle/framework/console/generators/stubs/model-term.stub b/src/mantle/framework/console/generators/stubs/model-term.stub
@@ -5,7 +5,7 @@
  * @package {{ namespace }}
  */
 
-namespace App\Models;
+namespace {{ namespace }}\Models;
 
 use Mantle\Database\Model\Term;
 

diff --git a/tests/framework/blocks/test-block-provider.php b/tests/framework/blocks/test-block-provider.php
@@ -15,13 +15,16 @@ protected function setUp(): void {
 		parent::setUp();
 
 		// Mock a true Mantle application.
-		Environment::get_repository()->set( 'APP_NAMESPACE', 'Mantle\\Tests' );
 		$this->app->set_app_path( dirname( __DIR__, 2 ) );
+
+		$this->app['config']->set( 'app.namespace', 'Mantle\\Tests' );
 	}
 
 	protected function tearDown(): void {
-		Environment::get_repository()->clear( 'APP_NAMESPACE' );
+		$this->app['config']->set( 'app.namespace', 'App' );
 		$this->app->set_app_path( $this->app->get_base_path( 'app' ) );
+
+		parent::tearDown();
 	}
 
 	/**
@@ -58,6 +61,8 @@ public function testBlockProviderRegistersBlocks() {
 		$app->set_base_path( getcwd() );
 		$app->set_app_path( __DIR__ . '/fixtures' );
 
+		$app['config'] = $this->app['config'];
+
 		$this->assertEquals( 'Mantle\\Tests', $app->get_namespace() );
 
 		/**

diff --git a/tests/framework/events/test-discover-events.php b/tests/framework/events/test-discover-events.php
@@ -15,13 +15,15 @@ protected function setUp(): void {
 		parent::setUp();
 
 		// Mock a true Mantle application.
-		Environment::get_repository()->set( 'APP_NAMESPACE', 'Mantle\\Tests' );
+		$this->app['config']->set( 'app.namespace', 'Mantle\\Tests' );
 		$this->app->set_app_path( dirname( __DIR__, 2 ) );
 	}
 
 	protected function tearDown(): void {
-		Environment::get_repository()->clear( 'APP_NAMESPACE' );
 		$this->app->set_app_path( $this->app->get_base_path( 'app' ) );
+		$this->app['config']->set( 'app.namespace', 'App' );
+
+		parent::tearDown();
 	}
 
 	public function test_events_can_be_discovered() {

diff --git a/tests/http/routing/test-post-model-routing.php b/tests/http/routing/test-post-model-routing.php
@@ -15,8 +15,9 @@ class Test_Post_Model_Routing extends Framework_Test_Case {
 	protected function setUp(): void {
 		parent::setUp();
 
-		update_option( 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/' );
-		flush_rewrite_rules();
+		$this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+
+		add_filter( 'deprecated_file_trigger_error', '__return_false' );
 	}
 
 	public function test_post_type() {