Added namespaces to some test fixtures.

phalcon · Jun 9, 2019 · e0d3655 · e0d3655
1 parent 907bc0d
commit e0d3655
Show file tree

Hide file tree

Showing 18 changed files with 156 additions and 130 deletions.
diff --git a/tests/_data/fixtures/Di/services.php b/tests/_data/fixtures/Di/services.php
@@ -1,15 +1,18 @@
 <?php
 
+use Phalcon\Config;
+use Phalcon\Test\Module\UnitTest;
+
 return [
     'unit-test' => [
-        'className' => \Phalcon\Test\Module\UnitTest::class,
+        'className' => UnitTest::class,
     ],
     'config' => [
-        'className' => \Phalcon\Config::class,
-        'shared' => true,
+        'className' => Config::class,
+        'shared'    => true,
     ],
     'component' => [
-        'className' => \SomeComponent::class,
+        'className' => SomeComponent::class,
         'arguments' => [
             [
                 'type' => 'service',

diff --git a/tests/_data/fixtures/Events/ComponentX.php b/tests/_data/fixtures/Events/ComponentX.php
@@ -10,6 +10,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Phalcon\Test\Fixtures\Events;
+
 use Phalcon\Events\Manager;
 
 class ComponentX

diff --git a/tests/_data/fixtures/Events/ComponentY.php b/tests/_data/fixtures/Events/ComponentY.php
@@ -10,6 +10,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Phalcon\Test\Fixtures\Events;
+
 use Phalcon\Events\Manager;
 
 class ComponentY

diff --git a/tests/_data/fixtures/Listener/ThirdListener.php b/tests/_data/fixtures/Listener/ThirdListener.php
@@ -12,9 +12,9 @@
 
 namespace Phalcon\Test\Fixtures\Listener;
 
-use ComponentX;
 use function dataDir;
 use Phalcon\Events\Event;
+use Phalcon\Test\Fixtures\Events\ComponentX;
 use Phalcon\Test\Unit\Events\ManagerCest;
 use UnitTester;
 
@@ -30,11 +30,6 @@ class ThirdListener
 
     protected $after = 0;
 
-    public function __construct()
-    {
-        include_once dataDir('fixtures/Events/ComponentX.php');
-    }
-
     public function setTestCase(ManagerCest $testCase, UnitTester $tester)
     {
         $this->testCase = $testCase;

diff --git a/tests/_data/fixtures/tasks/ParamsTask.php b/tests/_data/fixtures/tasks/ParamsTask.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Phalcon\Test\Fixtures\Tasks;
+
 class ParamsTask extends \Phalcon\CLI\Task
 {
     public function paramsAction()

diff --git a/tests/cli/Cli/Dispatcher/GetParamCest.php b/tests/cli/Cli/Dispatcher/GetParamCest.php
@@ -22,11 +22,6 @@ class GetParamCest
 
     public function _before(CliTester $I)
     {
-        /**
-         * @todo Check the loader
-         */
-        require_once dataDir('fixtures/tasks/ParamsTask.php');
-
         $this->setNewCliFactoryDefault();
     }
 
@@ -43,6 +38,7 @@ public function testCliParameters(CliTester $I)
         );
 
         // Test $this->dispatcher->getParam()
+        $dispatcher->setNamespaceName('Phalcon\Test\Fixtures\Tasks');
         $dispatcher->setTaskName('params');
         $dispatcher->setActionName('param');
 

diff --git a/tests/cli/Cli/Dispatcher/GetParamsCest.php b/tests/cli/Cli/Dispatcher/GetParamsCest.php
@@ -22,11 +22,6 @@ class GetParamsCest
 
     public function _before(CliTester $I)
     {
-        /**
-         * @todo Check the loader
-         */
-        require_once dataDir('fixtures/tasks/ParamsTask.php');
-
         $this->setNewCliFactoryDefault();
     }
 
@@ -41,6 +36,7 @@ public function testCliParameters(CliTester $I)
         );
 
         // Test $this->dispatcher->getParams()
+        $dispatcher->setNamespaceName('Phalcon\Test\Fixtures\Tasks');
         $dispatcher->setTaskName('params');
         $dispatcher->setActionName('params');
 

diff --git a/tests/integration/Mvc/Model/GetRelatedCest.php b/tests/integration/Mvc/Model/GetRelatedCest.php
@@ -94,7 +94,7 @@ public function mvcModelGetRelated(IntegrationTester $I)
         $robotParts = $robot->getRelated('robotsParts');
 
         $I->assertInstanceOf(
-            'Phalcon\Mvc\Model\Resultset\Simple',
+            \Phalcon\Mvc\Model\Resultset\Simple::class,
             $robotParts
         );
 

diff --git a/tests/integration/Mvc/Model/Refactor-BinderCest.php b/tests/integration/Mvc/Model/Refactor-BinderCest.php
@@ -131,13 +131,13 @@ public function testDispatcherSingleBinding(IntegrationTester $I)
                 ]
             );
 
-            $I->assertInstanceOf('Phalcon\Test\Models\People', $returnedValue);
+            $I->assertInstanceOf(People::class, $returnedValue);
 
             $I->assertEquals($this->people->cedula, $returnedValue->cedula);
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test10Controller_viewAction')
             );
@@ -219,8 +219,8 @@ public function testDispatcherMultiBinding(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
-                    'robots' => 'Phalcon\\Test\\Models\\Robots',
+                    'people' => People::class,
+                    'robots' => Robots::class,
                 ],
                 $this->cache->get('_PHMB_Test10Controller_multipleAction')
             );
@@ -257,7 +257,7 @@ public function testDispatcherSingleBindingWithInterface(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test11Controller_viewAction')
             );
@@ -301,8 +301,8 @@ public function testDispatcherMultiBindingWithInterface(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
-                    'robots' => 'Phalcon\\Test\\Models\\Robots',
+                    'people' => People::class,
+                    'robots' => Robots::class,
                 ],
                 $this->cache->get('_PHMB_Test11Controller_multipleAction')
             );
@@ -355,7 +355,7 @@ function () use ($dispatcher) {
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test9Controller_viewAction')
             );
@@ -395,7 +395,7 @@ function (People $people) {
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_people')
             );
@@ -455,8 +455,8 @@ function (People $people, Robots $robot) {
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
-                    'robots' => 'Phalcon\\Test\\Models\\Robots',
+                    'people' => People::class,
+                    'robots' => Robots::class,
                 ],
                 $this->cache->get('_PHMB_/{people}/robot/{robots}')
             );
@@ -508,7 +508,7 @@ function () use ($micro) {
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_/{people}')
             );
@@ -550,7 +550,7 @@ public function testMicroControllerSingleBinding(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test10Controller_viewAction')
             );
@@ -598,8 +598,8 @@ public function testMicroControllerMultiBinding(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
-                    'robots' => 'Phalcon\\Test\\Models\\Robots',
+                    'people' => People::class,
+                    'robots' => Robots::class,
                 ],
                 $this->cache->get('_PHMB_Test10Controller_multipleAction')
             );
@@ -639,7 +639,7 @@ public function testMicroControllerSingleBindingWithInterface(IntegrationTester
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test11Controller_viewAction')
             );
@@ -687,8 +687,8 @@ public function testMicroControllerMultiBindingWithInterface(IntegrationTester $
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
-                    'robots' => 'Phalcon\\Test\\Models\\Robots',
+                    'people' => People::class,
+                    'robots' => Robots::class,
                 ],
                 $this->cache->get('_PHMB_Test11Controller_multipleAction')
             );
@@ -742,7 +742,7 @@ function () use ($micro) {
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test9Controller_viewAction')
             );
@@ -783,7 +783,7 @@ public function testMicroLazySingleBinding(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test10Controller_viewAction')
             );
@@ -832,8 +832,8 @@ public function testMicroLazyMultiBinding(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
-                    'robots' => 'Phalcon\\Test\\Models\\Robots',
+                    'people' => People::class,
+                    'robots' => Robots::class,
                 ],
                 $this->cache->get('_PHMB_Test10Controller_multipleAction')
             );
@@ -874,7 +874,7 @@ public function testMicroLazySingleBindingWithInterface(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test11Controller_viewAction')
             );
@@ -923,8 +923,8 @@ public function testMicroLazyMultiBindingWithInterface(IntegrationTester $I)
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
-                    'robots' => 'Phalcon\\Test\\Models\\Robots',
+                    'people' => People::class,
+                    'robots' => Robots::class,
                 ],
                 $this->cache->get('_PHMB_Test11Controller_multipleAction')
             );
@@ -979,7 +979,7 @@ function () use ($micro) {
 
             $I->assertEquals(
                 [
-                    'people' => 'Phalcon\\Test\\Models\\People',
+                    'people' => People::class,
                 ],
                 $this->cache->get('_PHMB_Test9Controller_viewAction')
             );