Replace other literal configure calls with new convenience function setAppNamespace()

ravage84 · ravage84 · commit 41671410cbc0 · 2017-06-15T15:01:14.000+02:00
diff --git a/tests/TestCase/Core/AppTest.php b/tests/TestCase/Core/AppTest.php
@@ -14,7 +14,6 @@
 namespace Cake\Test\TestCase\Core;
 
 use Cake\Core\App;
-use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 use TestApp\Core\TestApp;
@@ -93,7 +92,7 @@ public function testShortName($class, $type, $suffix = '', $expected = false)
      */
     public function testShortNameWithNestedAppNamespace()
     {
-        Configure::write('App.namespace', 'TestApp/Nested');
+        static::setAppNamespace('TestApp/Nested');
 
         $return = TestApp::shortName(
             'TestApp/Nested/Controller/PagesController',
diff --git a/tests/TestCase/Http/MiddlewareQueueTest.php b/tests/TestCase/Http/MiddlewareQueueTest.php
@@ -46,8 +46,7 @@ public function setUp()
     public function tearDown()
     {
         parent::tearDown();
-
-        Configure::write('App.namespace', $this->appNamespace);
+        static::setAppNamespace($this->appNamespace);
     }
 
     /**
diff --git a/tests/TestCase/Mailer/MailerAwareTraitTest.php b/tests/TestCase/Mailer/MailerAwareTraitTest.php
@@ -45,7 +45,7 @@ public function testGetMailer()
         static::setAppNamespace();
         $stub = new Stub();
         $this->assertInstanceOf('TestApp\Mailer\TestMailer', $stub->getMailer('Test'));
-        Configure::write('App.namespace', $originalAppNamespace);
+        static::setAppNamespace($originalAppNamespace);
     }
 
     /**
diff --git a/tests/TestCase/Shell/CompletionShellTest.php b/tests/TestCase/Shell/CompletionShellTest.php
@@ -16,7 +16,6 @@
 
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOutput;
-use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\TestSuite\TestCase;
 
@@ -74,7 +73,7 @@ public function tearDown()
     {
         parent::tearDown();
         unset($this->Shell);
-        Configure::write('App.namespace', 'App');
+        static::setAppNamespace('App');
         Plugin::unload();
     }
 
diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -144,7 +144,7 @@ public function setUp()
 
         Configure::write('Config.language', 'eng');
         Configure::write('App.base', '');
-        Configure::write('App.namespace', 'Cake\Test\TestCase\View\Helper');
+        static::setAppNamespace('Cake\Test\TestCase\View\Helper');
         $this->View = new View();
 
         $this->Form = new FormHelper($this->View);
diff --git a/tests/TestCase/View/Helper/NumberHelperTest.php b/tests/TestCase/View/Helper/NumberHelperTest.php
@@ -74,7 +74,7 @@ public function setUp()
     public function tearDown()
     {
         parent::tearDown();
-        Configure::write('App.namespace', $this->_appNamespace);
+        static::setAppNamespace($this->_appNamespace);
         unset($this->View);
     }
 
diff --git a/tests/TestCase/View/Helper/TextHelperTest.php b/tests/TestCase/View/Helper/TextHelperTest.php
@@ -78,7 +78,7 @@ public function setUp()
     public function tearDown()
     {
         unset($this->Text, $this->View);
-        Configure::write('App.namespace', $this->_appNamespace);
+        static::setAppNamespace($this->_appNamespace);
         parent::tearDown();
     }
 
diff --git a/tests/TestCase/View/ViewBuilderTest.php b/tests/TestCase/View/ViewBuilderTest.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Test\TestCase\View;
 
-use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
 use Cake\View\ViewBuilder;
 
@@ -151,7 +150,7 @@ public function testBuildComplete()
      */
     public function testBuildAppViewMissing()
     {
-        Configure::write('App.namespace', 'Nope');
+        static::setAppNamespace('Nope');
         $builder = new ViewBuilder();
         $view = $builder->build();
         $this->assertInstanceOf('Cake\View\View', $view);
diff --git a/tests/test_app/TestApp/Shell/TestingDispatchShell.php b/tests/test_app/TestApp/Shell/TestingDispatchShell.php
@@ -17,7 +17,7 @@
 namespace TestApp\Shell;
 
 use Cake\Console\Shell;
-use Cake\Core\Configure;
+use Cake\TestSuite\TestCase;
 
 /**
  * for testing dispatchShell functionality
@@ -38,35 +38,35 @@ public function out($message = null, $newlines = 1, $level = Shell::NORMAL)
     public function testTask()
     {
         $this->out('I am a test task, I dispatch another Shell');
-        Configure::write('App.namespace', 'TestApp');
+        TestCase::setAppNamespace();
         $this->dispatchShell('testing_dispatch dispatch_test_task');
     }
 
     public function testTaskDispatchArray()
     {
         $this->out('I am a test task, I dispatch another Shell');
-        Configure::write('App.namespace', 'TestApp');
+        TestCase::setAppNamespace();
         $this->dispatchShell('testing_dispatch', 'dispatch_test_task');
     }
 
     public function testTaskDispatchCommandString()
     {
         $this->out('I am a test task, I dispatch another Shell');
-        Configure::write('App.namespace', 'TestApp');
+        TestCase::setAppNamespace();
         $this->dispatchShell(['command' => 'testing_dispatch dispatch_test_task']);
     }
 
     public function testTaskDispatchCommandArray()
     {
         $this->out('I am a test task, I dispatch another Shell');
-        Configure::write('App.namespace', 'TestApp');
+        TestCase::setAppNamespace();
         $this->dispatchShell(['command' => ['testing_dispatch', 'dispatch_test_task']]);
     }
 
     public function testTaskDispatchWithParam()
     {
         $this->out('I am a test task, I dispatch another Shell');
-        Configure::write('App.namespace', 'TestApp');
+        TestCase::setAppNamespace();
         $this->dispatchShell([
             'command' => ['testing_dispatch', 'dispatch_test_task_param'],
             'extra' => [
@@ -78,7 +78,7 @@ public function testTaskDispatchWithParam()
     public function testTaskDispatchWithMultipleParams()
     {
         $this->out('I am a test task, I dispatch another Shell');
-        Configure::write('App.namespace', 'TestApp');
+        TestCase::setAppNamespace();
         $this->dispatchShell([
             'command' => 'testing_dispatch dispatch_test_task_params',
             'extra' => [
@@ -91,7 +91,7 @@ public function testTaskDispatchWithMultipleParams()
     public function testTaskDispatchWithRequestedOff()
     {
         $this->out('I am a test task, I dispatch another Shell');
-        Configure::write('App.namespace', 'TestApp');
+        TestCase::setAppNamespace();
         $this->dispatchShell([
             'command' => ['testing_dispatch', 'dispatch_test_task'],
             'extra' => [

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ public function setUp()`
`46`	`46`	`public function tearDown()`
`47`	`47`	`{`
`48`	`48`	`parent::tearDown();`
`49`		`-`
`50`		`- Configure::write('App.namespace', $this->appNamespace);`
	`49`	`+ static::setAppNamespace($this->appNamespace);`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public function testGetMailer()`
`45`	`45`	`static::setAppNamespace();`
`46`	`46`	`$stub = new Stub();`
`47`	`47`	`$this->assertInstanceOf('TestApp\Mailer\TestMailer', $stub->getMailer('Test'));`
`48`		`- Configure::write('App.namespace', $originalAppNamespace);`
	`48`	`+ static::setAppNamespace($originalAppNamespace);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`use Cake\Console\ConsoleIo;`
`18`	`18`	`use Cake\Console\ConsoleOutput;`
`19`		`-use Cake\Core\Configure;`
`20`	`19`	`use Cake\Core\Plugin;`
`21`	`20`	`use Cake\TestSuite\TestCase;`
`22`	`21`
`@@ -74,7 +73,7 @@ public function tearDown()`
`74`	`73`	`{`
`75`	`74`	`parent::tearDown();`
`76`	`75`	`unset($this->Shell);`
`77`		`- Configure::write('App.namespace', 'App');`
	`76`	`+ static::setAppNamespace('App');`
`78`	`77`	`Plugin::unload();`
`79`	`78`	`}`
`80`	`79`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function setUp()`
`74`	`74`	`public function tearDown()`
`75`	`75`	`{`
`76`	`76`	`parent::tearDown();`
`77`		`- Configure::write('App.namespace', $this->_appNamespace);`
	`77`	`+ static::setAppNamespace($this->_appNamespace);`
`78`	`78`	`unset($this->View);`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function setUp()`
`78`	`78`	`public function tearDown()`
`79`	`79`	`{`
`80`	`80`	`unset($this->Text, $this->View);`
`81`		`- Configure::write('App.namespace', $this->_appNamespace);`
	`81`	`+ static::setAppNamespace($this->_appNamespace);`
`82`	`82`	`parent::tearDown();`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`namespace TestApp\Shell;`
`18`	`18`
`19`	`19`	`use Cake\Console\Shell;`
`20`		`-use Cake\Core\Configure;`
	`20`	`+use Cake\TestSuite\TestCase;`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* for testing dispatchShell functionality`
`@@ -38,35 +38,35 @@ public function out($message = null, $newlines = 1, $level = Shell::NORMAL)`
`38`	`38`	`public function testTask()`
`39`	`39`	`{`
`40`	`40`	`$this->out('I am a test task, I dispatch another Shell');`
`41`		`- Configure::write('App.namespace', 'TestApp');`
	`41`	`+ TestCase::setAppNamespace();`
`42`	`42`	`$this->dispatchShell('testing_dispatch dispatch_test_task');`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`public function testTaskDispatchArray()`
`46`	`46`	`{`
`47`	`47`	`$this->out('I am a test task, I dispatch another Shell');`
`48`		`- Configure::write('App.namespace', 'TestApp');`
	`48`	`+ TestCase::setAppNamespace();`
`49`	`49`	`$this->dispatchShell('testing_dispatch', 'dispatch_test_task');`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function testTaskDispatchCommandString()`
`53`	`53`	`{`
`54`	`54`	`$this->out('I am a test task, I dispatch another Shell');`
`55`		`- Configure::write('App.namespace', 'TestApp');`
	`55`	`+ TestCase::setAppNamespace();`
`56`	`56`	`$this->dispatchShell(['command' => 'testing_dispatch dispatch_test_task']);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public function testTaskDispatchCommandArray()`
`60`	`60`	`{`
`61`	`61`	`$this->out('I am a test task, I dispatch another Shell');`
`62`		`- Configure::write('App.namespace', 'TestApp');`
	`62`	`+ TestCase::setAppNamespace();`
`63`	`63`	`$this->dispatchShell(['command' => ['testing_dispatch', 'dispatch_test_task']]);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function testTaskDispatchWithParam()`
`67`	`67`	`{`
`68`	`68`	`$this->out('I am a test task, I dispatch another Shell');`
`69`		`- Configure::write('App.namespace', 'TestApp');`
	`69`	`+ TestCase::setAppNamespace();`
`70`	`70`	`$this->dispatchShell([`
`71`	`71`	`'command' => ['testing_dispatch', 'dispatch_test_task_param'],`
`72`	`72`	`'extra' => [`
`@@ -78,7 +78,7 @@ public function testTaskDispatchWithParam()`
`78`	`78`	`public function testTaskDispatchWithMultipleParams()`
`79`	`79`	`{`
`80`	`80`	`$this->out('I am a test task, I dispatch another Shell');`
`81`		`- Configure::write('App.namespace', 'TestApp');`
	`81`	`+ TestCase::setAppNamespace();`
`82`	`82`	`$this->dispatchShell([`
`83`	`83`	`'command' => 'testing_dispatch dispatch_test_task_params',`
`84`	`84`	`'extra' => [`
`@@ -91,7 +91,7 @@ public function testTaskDispatchWithMultipleParams()`
`91`	`91`	`public function testTaskDispatchWithRequestedOff()`
`92`	`92`	`{`
`93`	`93`	`$this->out('I am a test task, I dispatch another Shell');`
`94`		`- Configure::write('App.namespace', 'TestApp');`
	`94`	`+ TestCase::setAppNamespace();`
`95`	`95`	`$this->dispatchShell([`
`96`	`96`	`'command' => ['testing_dispatch', 'dispatch_test_task'],`
`97`	`97`	`'extra' => [`