From e0d36550d31aa39c57f1485f0ebf66c1efe21d51 Mon Sep 17 00:00:00 2001 From: Sid Roberts Date: Fri, 7 Jun 2019 08:41:35 +0900 Subject: [PATCH] Added namespaces to some test fixtures. --- tests/_data/fixtures/Di/services.php | 11 ++-- tests/_data/fixtures/Events/ComponentX.php | 2 + tests/_data/fixtures/Events/ComponentY.php | 2 + .../_data/fixtures/Listener/ThirdListener.php | 7 +-- tests/_data/fixtures/tasks/ParamsTask.php | 2 + tests/cli/Cli/Dispatcher/GetParamCest.php | 6 +-- tests/cli/Cli/Dispatcher/GetParamsCest.php | 6 +-- .../integration/Mvc/Model/GetRelatedCest.php | 2 +- .../Mvc/Model/Refactor-BinderCest.php | 52 +++++++++---------- .../Mvc/Model/Refactor-ModelsEventsCest.php | 44 ++++++++-------- .../Model/Refactor-ModelsResultsetCest.php | 46 ++++++++-------- .../Mvc/Model/UnderscoreGetCest.php | 4 +- tests/integration/Mvc/Refactor-ModelCest.php | 4 +- tests/unit/Annotations/Adapter/ApcuCest.php | 21 ++++++-- tests/unit/Annotations/Adapter/MemoryCest.php | 21 ++++++-- tests/unit/Annotations/Adapter/StreamCest.php | 16 ++++-- tests/unit/Di/DiCest.php | 27 ++++++---- tests/unit/Events/ManagerCest.php | 13 +---- 18 files changed, 156 insertions(+), 130 deletions(-) diff --git a/tests/_data/fixtures/Di/services.php b/tests/_data/fixtures/Di/services.php index 8975f81cf1b..975443b024e 100644 --- a/tests/_data/fixtures/Di/services.php +++ b/tests/_data/fixtures/Di/services.php @@ -1,15 +1,18 @@ [ - '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 index ea29ba3eefa..aa7b4ef62c0 100644 --- 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 index f6ee3ec48e5..92af677f0f4 100644 --- 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 index f7c40262352..8d0b367d90b 100644 --- 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 index 748480772be..c30f5878b83 100644 --- a/tests/_data/fixtures/tasks/ParamsTask.php +++ b/tests/_data/fixtures/tasks/ParamsTask.php @@ -1,5 +1,7 @@ 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 index 8056643d98a..db3e4779f17 100644 --- 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 index ecfef913a7f..da0f5f86449 100644 --- 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 index 00f75c695dd..65ea2bb6207 100644 --- 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') ); diff --git a/tests/integration/Mvc/Model/Refactor-ModelsEventsCest.php b/tests/integration/Mvc/Model/Refactor-ModelsEventsCest.php index aafc46c973f..afca26b8ca5 100644 --- a/tests/integration/Mvc/Model/Refactor-ModelsEventsCest.php +++ b/tests/integration/Mvc/Model/Refactor-ModelsEventsCest.php @@ -26,7 +26,7 @@ public function testEventsFetch(IntegrationTester $I) $trace, [ 'afterFetch' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], ] ); @@ -88,28 +88,28 @@ public function testEventsCreate(IntegrationTester $I) $trace, [ 'prepareSave' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], 'beforeValidation' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'beforeValidationOnCreate' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], 'validation' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'afterValidationOnCreate' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], 'afterValidation' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'beforeSave' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'beforeCreate' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], ] ); @@ -132,37 +132,37 @@ public function testEventsUpdate(IntegrationTester $I) $trace, [ 'prepareSave' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], 'beforeValidation' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'beforeValidationOnUpdate' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'validation' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'afterValidationOnUpdate' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'afterValidation' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'beforeSave' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'beforeUpdate' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'afterUpdate' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'afterSave' => [ - 'Phalcon\Test\Models\GossipRobots' => 2, + GossipRobots::class => 2, ], 'afterFetch' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], ] ); @@ -185,10 +185,10 @@ public function testEventsDelete(IntegrationTester $I) $trace, [ 'afterFetch' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], 'beforeDelete' => [ - 'Phalcon\Test\Models\GossipRobots' => 1, + GossipRobots::class => 1, ], ] ); diff --git a/tests/integration/Mvc/Model/Refactor-ModelsResultsetCest.php b/tests/integration/Mvc/Model/Refactor-ModelsResultsetCest.php index 551e2d3fa93..79fefc6372e 100644 --- a/tests/integration/Mvc/Model/Refactor-ModelsResultsetCest.php +++ b/tests/integration/Mvc/Model/Refactor-ModelsResultsetCest.php @@ -163,7 +163,7 @@ public function testSerializeNormalMysql(IntegrationTester $I) $data = serialize(Robots::find(['order' => 'id'])); $robots = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $robots); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots); $this->applyTests($I, $robots); } @@ -175,7 +175,7 @@ public function testSerializeNormalPostgresql(IntegrationTester $I) $data = serialize(Robots::find(['order' => 'id'])); $robots = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $robots); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots); $this->applyTests($I, $robots); } @@ -187,7 +187,7 @@ public function testSerializeNormalSqlite(IntegrationTester $I) $data = serialize(Robots::find(['order' => 'id'])); $robots = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $robots); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots); $this->applyTests($I, $robots); } @@ -206,7 +206,7 @@ public function testSerializeBindingsMysql(IntegrationTester $I) ])); $robots = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $robots); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots); $this->applyTests($I, $robots); } @@ -226,7 +226,7 @@ public function testSerializeBindingsPostgresql(IntegrationTester $I) $robots = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $robots); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots); $this->applyTests($I, $robots); } @@ -246,7 +246,7 @@ public function testSerializeBindingsSqlite(IntegrationTester $I) $robots = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $robots); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $robots); $this->applyTests($I, $robots); } @@ -261,7 +261,7 @@ public function testSerializeBigMysql(IntegrationTester $I) $personas = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $personas); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $personas); $this->applyTestsBig($I, $personas); } @@ -291,19 +291,19 @@ private function applyTestsBig(IntegrationTester $I, $personas) $personas->seek(1); $personas->valid(); $persona = $personas->current(); - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $persona); + $I->assertInstanceOf(Personas::class, $persona); $persona = $personas->getFirst(); - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $persona); + $I->assertInstanceOf(Personas::class, $persona); $persona = $personas->getLast(); - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $persona); + $I->assertInstanceOf(Personas::class, $persona); $persona = $personas[0]; - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $persona); + $I->assertInstanceOf(Personas::class, $persona); $persona = $personas[2]; - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $persona); + $I->assertInstanceOf(Personas::class, $persona); $I->assertFalse(isset($personas[40])); } @@ -318,7 +318,7 @@ public function testSerializeBigPostgresql(IntegrationTester $I) $personas = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $personas); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $personas); $this->applyTestsBig($I, $personas); } @@ -333,7 +333,7 @@ public function testSerializeBigSqlite(IntegrationTester $I) $personas = unserialize($data); - $I->assertInstanceOf('Phalcon\Mvc\Model\Resultset\Simple', $personas); + $I->assertInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class, $personas); $this->applyTestsBig($I, $personas); } @@ -414,21 +414,21 @@ public function testResultsetAppendIterator(IntegrationTester $I) $I->assertTrue($iterator->valid()); $I->assertEquals($iterator->key(), 0); $I->assertEquals($iterator->getIteratorIndex(), 0); - $I->assertInstanceOf('Phalcon\Test\Models\Robots', $iterator->current()); + $I->assertInstanceOf(Robots::class, $iterator->current()); $I->assertEquals($robots_first_0->name, $iterator->current()->name); $iterator->next(); $I->assertTrue($iterator->valid()); $I->assertEquals($iterator->key(), 1); $I->assertEquals($iterator->getIteratorIndex(), 0); - $I->assertInstanceOf('Phalcon\Test\Models\Robots', $iterator->current()); + $I->assertInstanceOf(Robots::class, $iterator->current()); $I->assertEquals($robots_first_1->name, $iterator->current()->name); $iterator->next(); $I->assertTrue($iterator->valid()); $I->assertEquals($iterator->key(), 0); $I->assertEquals($iterator->getIteratorIndex(), 1); - $I->assertInstanceOf('Phalcon\Test\Models\Robots', $iterator->current()); + $I->assertInstanceOf(Robots::class, $iterator->current()); $I->assertEquals($robots_second_0->name, $iterator->current()->name); $iterator->next(); @@ -446,11 +446,11 @@ public function testBigResultsetIteration(IntegrationTester $I) $I->assertCount(33, $personas); - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $personas->getLast()); + $I->assertInstanceOf(Personas::class, $personas->getLast()); // take first object as reference $persona_first = $personas[0]; - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $persona_first); + $I->assertInstanceOf(Personas::class, $persona_first); // make sure objects are the same -> object was not recreared $I->assertSame($personas[0], $persona_first); @@ -500,13 +500,13 @@ public function testBigResultsetIteration(IntegrationTester $I) // move to second element and validate $personas->next(); $I->assertTrue($personas->valid()); - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $personas[1]); + $I->assertInstanceOf(Personas::class, $personas[1]); $I->assertSame($personas->current(), $personas[1]); $I->assertEquals($persona_second, $personas[1]); // pick some random indices - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $personas[12]); - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $personas[23]); - $I->assertInstanceOf('Phalcon\Test\Models\Personas', $personas[23]); + $I->assertInstanceOf(Personas::class, $personas[12]); + $I->assertInstanceOf(Personas::class, $personas[23]); + $I->assertInstanceOf(Personas::class, $personas[23]); } } diff --git a/tests/integration/Mvc/Model/UnderscoreGetCest.php b/tests/integration/Mvc/Model/UnderscoreGetCest.php index fd80251e384..52fe861458c 100644 --- a/tests/integration/Mvc/Model/UnderscoreGetCest.php +++ b/tests/integration/Mvc/Model/UnderscoreGetCest.php @@ -137,7 +137,7 @@ public function mvcModelUnderscoreGetRelated(IntegrationTester $I) $robotParts = $robot->robotsParts; $I->assertInstanceOf( - 'Phalcon\Mvc\Model\Resultset\Simple', + \Phalcon\Mvc\Model\Resultset\Simple::class, $robotParts ); } @@ -160,7 +160,7 @@ public function mvcModelUnderscoreGetDirtyRelated(IntegrationTester $I) $robotsParts = $robot->robotsParts; $I->assertInstanceOf( - 'Phalcon\Mvc\Model\Resultset\Simple', + \Phalcon\Mvc\Model\Resultset\Simple::class, $robotsParts ); diff --git a/tests/integration/Mvc/Refactor-ModelCest.php b/tests/integration/Mvc/Refactor-ModelCest.php index 2010b15f305..ee194621c71 100644 --- a/tests/integration/Mvc/Refactor-ModelCest.php +++ b/tests/integration/Mvc/Refactor-ModelCest.php @@ -320,10 +320,10 @@ public function executeCamelCaseRelation(IntegrationTester $I) // // Single row serialization // $result = $modelsManager->executeQuery("SELECT id FROM " . Robots::class . " LIMIT 1"); // -// expect($result)->isInstanceOf('Phalcon\Mvc\Model\Resultset\Simple'); +// expect($result)->isInstanceOf(\Phalcon\Mvc\Model\Resultset\Simple::class); // // foreach ($result as $row) { -// expect($row)->isInstanceOf('Phalcon\Mvc\Model\Row'); +// expect($row)->isInstanceOf(\Phalcon\Mvc\Model\Row::class); // expect($row->id)->equals($robot->id); // // $json = json_encode($row); diff --git a/tests/unit/Annotations/Adapter/ApcuCest.php b/tests/unit/Annotations/Adapter/ApcuCest.php index 02eaade6446..68e0abd2fc6 100644 --- a/tests/unit/Annotations/Adapter/ApcuCest.php +++ b/tests/unit/Annotations/Adapter/ApcuCest.php @@ -31,7 +31,9 @@ public function testApcAdapter(UnitTester $I) { $adapter = new Apcu(); - $classAnnotations = $adapter->get('TestClass'); + $classAnnotations = $adapter->get( + \TestClass::class + ); $I->assertInternalType('object', $classAnnotations); @@ -45,7 +47,9 @@ public function testApcAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $classAnnotations = $adapter->get('TestClass'); + $classAnnotations = $adapter->get( + \TestClass::class + ); $I->assertInternalType('object', $classAnnotations); @@ -59,7 +63,9 @@ public function testApcAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $classAnnotations = $adapter->get('User\TestClassNs'); + $classAnnotations = $adapter->get( + \User\TestClassNs::class + ); $I->assertInternalType('object', $classAnnotations); @@ -73,7 +79,9 @@ public function testApcAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $classAnnotations = $adapter->get('User\TestClassNs'); + $classAnnotations = $adapter->get( + \User\TestClassNs::class + ); $I->assertInternalType('object', $classAnnotations); @@ -87,7 +95,10 @@ public function testApcAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $property = $adapter->getProperty('TestClass', 'testProp1'); + $property = $adapter->getProperty( + \TestClass::class, + 'testProp1' + ); $I->assertInternalType('object', $property); diff --git a/tests/unit/Annotations/Adapter/MemoryCest.php b/tests/unit/Annotations/Adapter/MemoryCest.php index f12d4063c7e..0b619575628 100644 --- a/tests/unit/Annotations/Adapter/MemoryCest.php +++ b/tests/unit/Annotations/Adapter/MemoryCest.php @@ -32,7 +32,9 @@ public function testMemoryAdapter(UnitTester $I) $adapter = new Memory(); - $classAnnotations = $adapter->get('TestClass'); + $classAnnotations = $adapter->get( + \TestClass::class + ); $I->assertInternalType('object', $classAnnotations); @@ -46,7 +48,9 @@ public function testMemoryAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $classAnnotations = $adapter->get('TestClass'); + $classAnnotations = $adapter->get( + \TestClass::class + ); $I->assertInternalType('object', $classAnnotations); @@ -60,7 +64,9 @@ public function testMemoryAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $classAnnotations = $adapter->get('User\TestClassNs'); + $classAnnotations = $adapter->get( + \User\TestClassNs::class + ); $I->assertInternalType('object', $classAnnotations); @@ -74,7 +80,9 @@ public function testMemoryAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $classAnnotations = $adapter->get('User\TestClassNs'); + $classAnnotations = $adapter->get( + \User\TestClassNs::class + ); $I->assertInternalType('object', $classAnnotations); @@ -88,7 +96,10 @@ public function testMemoryAdapter(UnitTester $I) $classAnnotations->getClassAnnotations() ); - $property = $adapter->getProperty('TestClass', 'testProp1'); + $property = $adapter->getProperty( + \TestClass::class, + 'testProp1' + ); $I->assertInternalType('object', $property); diff --git a/tests/unit/Annotations/Adapter/StreamCest.php b/tests/unit/Annotations/Adapter/StreamCest.php index a8ae713a9b3..8a7aeea3671 100644 --- a/tests/unit/Annotations/Adapter/StreamCest.php +++ b/tests/unit/Annotations/Adapter/StreamCest.php @@ -30,7 +30,9 @@ public function testStreamAdapter(UnitTester $I) - $classAnnotations = $adapter->get('TestClass'); + $classAnnotations = $adapter->get( + \TestClass::class + ); $I->assertInternalType('object', $classAnnotations); @@ -46,7 +48,9 @@ public function testStreamAdapter(UnitTester $I) - $classAnnotations = $adapter->get('TestClass'); + $classAnnotations = $adapter->get( + \TestClass::class + ); $I->assertInternalType('object', $classAnnotations); @@ -62,7 +66,9 @@ public function testStreamAdapter(UnitTester $I) - $classAnnotations = $adapter->get('User\TestClassNs'); + $classAnnotations = $adapter->get( + \User\TestClassNs::class + ); $I->assertInternalType('object', $classAnnotations); @@ -78,7 +84,9 @@ public function testStreamAdapter(UnitTester $I) - $classAnnotations = $adapter->get('User\TestClassNs'); + $classAnnotations = $adapter->get( + \User\TestClassNs::class + ); $I->assertInternalType('object', $classAnnotations); diff --git a/tests/unit/Di/DiCest.php b/tests/unit/Di/DiCest.php index 2e6caa63a7f..9f982e169d6 100644 --- a/tests/unit/Di/DiCest.php +++ b/tests/unit/Di/DiCest.php @@ -17,6 +17,7 @@ namespace Phalcon\Test\Unit\Di; use function dataDir; +use InjectableComponent; use Phalcon\Config; use Phalcon\Di; use Phalcon\Di\Exception; @@ -234,7 +235,9 @@ public function testMagicGetCall(UnitTester $I) */ public function testMagicSetCall(UnitTester $I) { - $this->phDi->setRequest9('Phalcon\Http\Request'); + $this->phDi->setRequest9( + Request::class + ); $I->assertInstanceOf( Request::class, @@ -257,7 +260,10 @@ function ($v) { } ); - $this->phDi->set('someComponent2', 'SomeComponent'); + $this->phDi->set( + 'someComponent2', + SomeComponent::class + ); $someComponent1 = $this->phDi->get( @@ -360,7 +366,10 @@ public function testRegisteringViaArrayAccess(UnitTester $I) */ public function testResolvingViaArrayAccess(UnitTester $I) { - $this->phDi->set('simple', 'SimpleComponent'); + $this->phDi->set( + 'simple', + SimpleComponent::class + ); $I->assertInstanceOf( SimpleComponent::class, @@ -421,7 +430,7 @@ public function testComplexInjection(UnitTester $I) $this->phDi->set( 'simpleConstructor', [ - 'className' => \InjectableComponent::class, + 'className' => InjectableComponent::class, 'arguments' => [ [ 'type' => 'parameter', @@ -435,7 +444,7 @@ public function testComplexInjection(UnitTester $I) $this->phDi->set( 'simpleSetters', [ - 'className' => \InjectableComponent::class, + 'className' => InjectableComponent::class, 'calls' => [ [ 'method' => 'setResponse', @@ -454,7 +463,7 @@ public function testComplexInjection(UnitTester $I) $this->phDi->set( 'simpleProperties', [ - 'className' => \InjectableComponent::class, + 'className' => InjectableComponent::class, 'properties' => [ [ 'name' => 'response', @@ -471,7 +480,7 @@ public function testComplexInjection(UnitTester $I) $this->phDi->set( 'complexConstructor', [ - 'className' => \InjectableComponent::class, + 'className' => InjectableComponent::class, 'arguments' => [ [ 'type' => 'service', @@ -485,7 +494,7 @@ public function testComplexInjection(UnitTester $I) $this->phDi->set( 'complexSetters', [ - 'className' => \InjectableComponent::class, + 'className' => InjectableComponent::class, 'calls' => [ [ 'method' => 'setResponse', @@ -504,7 +513,7 @@ public function testComplexInjection(UnitTester $I) $this->phDi->set( 'complexProperties', [ - 'className' => \InjectableComponent::class, + 'className' => InjectableComponent::class, 'properties' => [ [ 'name' => 'response', diff --git a/tests/unit/Events/ManagerCest.php b/tests/unit/Events/ManagerCest.php index 7236e09cac4..7ab55c0c218 100644 --- a/tests/unit/Events/ManagerCest.php +++ b/tests/unit/Events/ManagerCest.php @@ -12,11 +12,11 @@ namespace Phalcon\Test\Unit\Events; use Codeception\Example; -use ComponentX; -use ComponentY; use function dataDir; use Phalcon\Events\Event; use Phalcon\Events\Manager; +use Phalcon\Test\Fixtures\Events\ComponentX; +use Phalcon\Test\Fixtures\Events\ComponentY; use Phalcon\Test\Fixtures\Listener\FirstListener; use Phalcon\Test\Fixtures\Listener\SecondListener; use Phalcon\Test\Fixtures\Listener\ThirdListener; @@ -26,15 +26,6 @@ class ManagerCest { protected $listener; - /** - * executed before each test - */ - public function _before(UnitTester $I) - { - include_once dataDir('fixtures/Events/ComponentX.php'); - include_once dataDir('fixtures/Events/ComponentY.php'); - } - /** * Tests attaching event listeners by event name after detaching all *