[#14213] - References corrections

phalcon · Jul 4, 2019 · d5a0b0b · d5a0b0b
1 parent 95d3c38
commit d5a0b0b
Show file tree

Hide file tree

Showing 30 changed files with 61 additions and 67 deletions.
diff --git a/tests/_data/fixtures/models/Abonnes.php b/tests/_data/fixtures/models/Abonnes.php
@@ -13,7 +13,6 @@
 
 use Phalcon\Messages\Message;
 use Phalcon\Mvc\Model;
-use Phalcon\Validation;
 use Phalcon\Validation\Validator\Email as EmailValidator;
 use Phalcon\Validation\Validator\ExclusionIn as ExclusionInValidator;
 use Phalcon\Validation\Validator\InclusionIn as InclusionInValidator;

diff --git a/tests/_data/fixtures/models/Subscriptores.php b/tests/_data/fixtures/models/Subscriptores.php
@@ -13,7 +13,6 @@
 
 use Phalcon\Messages\Message;
 use Phalcon\Mvc\Model;
-use Phalcon\Validation;
 use Phalcon\Validation\Validator\Email as EmailValidator;
 use Phalcon\Validation\Validator\ExclusionIn as ExclusionInValidator;
 use Phalcon\Validation\Validator\InclusionIn as InclusionInValidator;

diff --git a/tests/_data/fixtures/models/Validation/Robots.php b/tests/_data/fixtures/models/Validation/Robots.php
@@ -14,7 +14,6 @@
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset\Simple;
 use Phalcon\Test\Models\RobotsParts;
-use Phalcon\Validation;
 use Phalcon\Validation\Validator\StringLength;
 
 /**

diff --git a/tests/_data/fixtures/models/Validation/Subscriptores.php b/tests/_data/fixtures/models/Validation/Subscriptores.php
@@ -13,7 +13,6 @@
 
 use Phalcon\Messages\Message;
 use Phalcon\Mvc\Model;
-use Phalcon\Validation;
 use Phalcon\Validation\Validator\Email;
 use Phalcon\Validation\Validator\ExclusionIn;
 use Phalcon\Validation\Validator\InclusionIn;

diff --git a/tests/cli/Cli/Dispatcher/DispatchCest.php b/tests/cli/Cli/Dispatcher/DispatchCest.php
@@ -13,8 +13,8 @@
 namespace Phalcon\Test\Cli\Cli\Dispatcher;
 
 use CliTester;
-use Exception;
 use Phalcon\Cli\Dispatcher;
+use Phalcon\Cli\Dispatcher\Exception;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 
 class DispatchCest
@@ -58,7 +58,7 @@ public function testFakeNamespace(CliTester $I)
         $I->expectThrowable(
             new Exception(
                 'Dummy\MainTask handler class cannot be loaded',
-                Dispatcher::EXCEPTION_HANDLER_NOT_FOUND
+                Exception::EXCEPTION_HANDLER_NOT_FOUND
             ),
             function () use ($dispatcher) {
                 $dispatcher->dispatch();

diff --git a/tests/cli/Cli/Dispatcher/GetHandlerSuffixCest.php b/tests/cli/Cli/Dispatcher/GetHandlerSuffixCest.php
@@ -51,7 +51,7 @@ public function cliDispatcherGetHandlerSuffix(CliTester $I)
         $I->expectThrowable(
             new Exception(
                 'IndexBleh handler class cannot be loaded',
-                Dispatcher::EXCEPTION_HANDLER_NOT_FOUND
+                Exception::EXCEPTION_HANDLER_NOT_FOUND
             ),
             function () use ($dispatcher) {
                 $dispatcher->dispatch();

diff --git a/tests/integration/Db/Adapter/Pdo/Mysql/QueryCest.php b/tests/integration/Db/Adapter/Pdo/Mysql/QueryCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Mysql;
 
 use IntegrationTester;
-use Phalcon\Db;
+use Phalcon\Db\Enum;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 
 class QueryCest
@@ -75,7 +75,7 @@ public function dbAdapterPdoMysqlQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_NUM);
+        $result->setFetchMode(Enum::FETCH_NUM);
         $row = $result->fetch();
         $I->assertInternalType('array', $row);
         $I->assertCount(11, $row);
@@ -86,7 +86,7 @@ public function dbAdapterPdoMysqlQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_ASSOC);
+        $result->setFetchMode(Enum::FETCH_ASSOC);
         $row = $result->fetch();
         $I->assertInternalType('array', $row);
         $I->assertCount(11, $row);
@@ -97,15 +97,15 @@ public function dbAdapterPdoMysqlQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_OBJ);
+        $result->setFetchMode(Enum::FETCH_OBJ);
         $row = $result->fetch();
         $I->assertInternalType('object', $row);
         $I->assertTrue(isset($row->cedula));
 
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_BOTH);
+        $result->setFetchMode(Enum::FETCH_BOTH);
         $result->dataSeek(4);
         $row = $result->fetch();
         $row = $result->fetch();

diff --git a/tests/integration/Db/Adapter/Pdo/Postgresql/QueryCest.php b/tests/integration/Db/Adapter/Pdo/Postgresql/QueryCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Postgresql;
 
 use IntegrationTester;
-use Phalcon\Db;
+use Phalcon\Db\Enum;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 
 class QueryCest
@@ -75,7 +75,7 @@ public function dbAdapterPdoPostgresqlQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_NUM);
+        $result->setFetchMode(Enum::FETCH_NUM);
         $row = $result->fetch();
         $I->assertInternalType('array', $row);
         $I->assertCount(11, $row);
@@ -86,7 +86,7 @@ public function dbAdapterPdoPostgresqlQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_ASSOC);
+        $result->setFetchMode(Enum::FETCH_ASSOC);
         $row = $result->fetch();
         $I->assertInternalType('array', $row);
         $I->assertCount(11, $row);
@@ -97,15 +97,15 @@ public function dbAdapterPdoPostgresqlQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_OBJ);
+        $result->setFetchMode(Enum::FETCH_OBJ);
         $row = $result->fetch();
         $I->assertInternalType('object', $row);
         $I->assertTrue(isset($row->cedula));
 
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_BOTH);
+        $result->setFetchMode(Enum::FETCH_BOTH);
         $result->dataSeek(4);
         $row = $result->fetch();
         $row = $result->fetch();

diff --git a/tests/integration/Db/Adapter/Pdo/Sqlite/QueryCest.php b/tests/integration/Db/Adapter/Pdo/Sqlite/QueryCest.php
@@ -13,7 +13,6 @@
 namespace Phalcon\Test\Integration\Db\Adapter\Pdo\Sqlite;
 
 use IntegrationTester;
-use Phalcon\Db;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 
 class QueryCest
@@ -70,7 +69,7 @@ public function dbAdapterPdoSqliteQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_NUM);
+        $result->setFetchMode(Enum::FETCH_NUM);
         $row = $result->fetch();
         $I->assertInternalType('array', $row);
         $I->assertCount(11, $row);
@@ -81,7 +80,7 @@ public function dbAdapterPdoSqliteQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_ASSOC);
+        $result->setFetchMode(Enum::FETCH_ASSOC);
         $row = $result->fetch();
         $I->assertInternalType('array', $row);
         $I->assertCount(11, $row);
@@ -92,15 +91,15 @@ public function dbAdapterPdoSqliteQuery(IntegrationTester $I)
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_OBJ);
+        $result->setFetchMode(Enum::FETCH_OBJ);
         $row = $result->fetch();
         $I->assertInternalType('object', $row);
         $I->assertTrue(isset($row->cedula));
 
 
 
         $result = $connection->query('SELECT * FROM personas LIMIT 5');
-        $result->setFetchMode(Db::FETCH_BOTH);
+        $result->setFetchMode(Enum::FETCH_BOTH);
         $result->dataSeek(4);
         $row = $result->fetch();
         $row = $result->fetch();

diff --git a/tests/integration/Db/DbCest.php b/tests/integration/Db/DbCest.php
@@ -14,7 +14,7 @@
 use Codeception\Example;
 use IntegrationTester;
 use PDO;
-use Phalcon\Db;
+use Phalcon\Db\Enum;
 use Phalcon\Db\RawValue;
 use Phalcon\Test\Fixtures\Traits\DiTrait;
 
@@ -223,7 +223,7 @@ public function db(IntegrationTester $I, Example $example)
 
         $row = $connection->fetchOne(
             'select count(*) as cnt from prueba where nombre=? and estado=?',
-            Db::FETCH_ASSOC,
+            Enum::FETCH_ASSOC,
             [
                 'LOL array syntax 2', 'X',
             ]
@@ -252,7 +252,7 @@ public function db(IntegrationTester $I, Example $example)
 
         $row = $connection->fetchOne(
             'select count(*) as cnt from prueba where nombre=? and estado=?',
-            Db::FETCH_ASSOC,
+            Enum::FETCH_ASSOC,
             [
                 'LOL array syntax 3', 'E',
             ]
@@ -272,7 +272,7 @@ public function db(IntegrationTester $I, Example $example)
 
         $row = $connection->fetchOne(
             'select count(*) as cnt from prueba where nombre=? and estado=?',
-            Db::FETCH_ASSOC,
+            Enum::FETCH_ASSOC,
             [
                 'LOL insertAsDict', 'E',
             ]
@@ -292,7 +292,7 @@ public function db(IntegrationTester $I, Example $example)
 
         $row = $connection->fetchOne(
             'select count(*) as cnt from prueba where nombre=? and estado=?',
-            Db::FETCH_ASSOC,
+            Enum::FETCH_ASSOC,
             [
                 'LOL updateAsDict', 'X',
             ]
@@ -319,7 +319,7 @@ public function db(IntegrationTester $I, Example $example)
 
         $I->assertCount(
             11,
-            $connection->fetchOne('SELECT * FROM personas', Db::FETCH_NUM)
+            $connection->fetchOne('SELECT * FROM personas', Enum::FETCH_NUM)
         );
 
         $I->assertCount(
@@ -329,7 +329,7 @@ public function db(IntegrationTester $I, Example $example)
 
         $rows = $connection->fetchAll(
             'SELECT * FROM personas LIMIT 10',
-            Db::FETCH_NUM
+            Enum::FETCH_NUM
         );
         $I->assertCount(10, $rows);
         $I->assertCount(11, $rows[0]);

diff --git a/tests/integration/Firewall/Adapter/Acl/AfterBindingCest.php b/tests/integration/Firewall/Adapter/Acl/AfterBindingCest.php
@@ -17,7 +17,7 @@
 use function ob_end_clean;
 use function ob_start;
 use Phalcon\Acl\Adapter\Memory;
-use Phalcon\Acl as PhAcl;
+use Phalcon\Acl\Enum;
 use Phalcon\Events\Manager;
 use Phalcon\Firewall\Adapter\Acl;
 use Phalcon\Mvc\Dispatcher;
@@ -96,7 +96,7 @@ public function firewallAdapterAclAfterBinding(IntegrationTester $I, Example $ex
         $I->wantToTest('Firewall\Adapter\Acl - afterBinding()');
 
         $acl = new Memory();
-        $acl->setDefaultAction(PhAcl::DENY);
+        $acl->setDefaultAction(Enum::DENY);
         $acl->addComponent('Four', ['first', 'second']);
         $acl->addRole('ROLE1');
         $acl->addRole('ROLE2');

diff --git a/tests/integration/Firewall/Adapter/Acl/BeforeExecuteRouteCest.php b/tests/integration/Firewall/Adapter/Acl/BeforeExecuteRouteCest.php
@@ -16,7 +16,7 @@
 use function ob_end_clean;
 use function ob_start;
 use Phalcon\Acl\Adapter\Memory;
-use Phalcon\Acl as PhAcl;
+use Phalcon\Acl\Enum;
 use Phalcon\Events\Manager;
 use Phalcon\Firewall\Adapter\Acl;
 use Phalcon\Mvc\Dispatcher;
@@ -100,7 +100,7 @@ public function firewallAdapterAclBeforeExecuteRoute(IntegrationTester $I)
 
         $acl = new Memory();
 
-        $acl->setDefaultAction(PhAcl::DENY);
+        $acl->setDefaultAction(Enum::DENY);
 
         $acl->addComponent('One', ['firstRole', 'secondRole']);
 

diff --git a/tests/integration/Firewall/Adapter/Acl/GetSetDefaultAccessCest.php b/tests/integration/Firewall/Adapter/Acl/GetSetDefaultAccessCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Firewall\Adapter\Acl;
 
 use IntegrationTester;
-use Phalcon\Acl as PhAcl;
+use Phalcon\Acl\Enum;
 use Phalcon\Firewall\Adapter\Acl;
 
 class GetSetDefaultAccessCest
@@ -29,9 +29,9 @@ public function firewallAdapterAclGetDefaultAccess(IntegrationTester $I)
         $I->wantToTest('Firewall\Adapter\Acl - getDefaultAccess()');
 
         $firewall = new Acl('acl');
-        $firewall->setDefaultAccess(PhAcl::ALLOW);
+        $firewall->setDefaultAccess(Enum::ALLOW);
 
         $actual = $firewall->getDefaultAccess();
-        $I->assertEquals(PhAcl::ALLOW, $actual);
+        $I->assertEquals(Enum::ALLOW, $actual);
     }
 }
diff --git a/tests/integration/Firewall/Adapter/Acl/SetBoundModelsKeyMapCest.php b/tests/integration/Firewall/Adapter/Acl/SetBoundModelsKeyMapCest.php
@@ -16,7 +16,7 @@
 use function ob_end_clean;
 use function ob_start;
 use Phalcon\Acl\Adapter\Memory;
-use Phalcon\Acl as PhAcl;
+use Phalcon\Acl\Enum;
 use Phalcon\Events\Manager;
 use Phalcon\Firewall\Adapter\Acl;
 use Phalcon\Mvc\Dispatcher;
@@ -93,7 +93,7 @@ public function firewallAdapterAclSetBoundModelsKeyMap(IntegrationTester $I)
         $I->wantToTest('Firewall\Adapter\Acl - setBoundModelsKeyMap()');
 
         $acl = new Memory();
-        $acl->setDefaultAction(PhAcl::DENY);
+        $acl->setDefaultAction(Enum::DENY);
         $acl->addComponent('Four', ['first', 'second']);
         $acl->addRole('ROLE2');
         $acl->allow(

diff --git a/tests/integration/Firewall/Adapter/Acl/SetCacheCest.php b/tests/integration/Firewall/Adapter/Acl/SetCacheCest.php
@@ -16,7 +16,7 @@
 use function ob_end_clean;
 use function ob_start;
 use Phalcon\Acl\Adapter\Memory;
-use Phalcon\Acl as PhAcl;
+use Phalcon\Acl\Enum;
 use Phalcon\Cache\AdapterFactory;
 use Phalcon\Events\Manager;
 use Phalcon\Firewall\Adapter\Acl;
@@ -95,7 +95,7 @@ public function firewallAdapterAclSetCache(IntegrationTester $I)
         $I->wantToTest('Firewall\Adapter\Acl - setCache()');
 
         $acl = new Memory();
-        $acl->setDefaultAction(PhAcl::DENY);
+        $acl->setDefaultAction(Enum::DENY);
         $acl->addComponent('Four', ['first', 'second']);
         $acl->addComponent('Three', ['deny',]);
         $acl->addRole('ROLE1');

diff --git a/tests/integration/Firewall/Adapter/Acl/UseMultiModuleConfigurationCest.php b/tests/integration/Firewall/Adapter/Acl/UseMultiModuleConfigurationCest.php
@@ -16,7 +16,7 @@
 use function ob_end_clean;
 use function ob_start;
 use Phalcon\Acl\Adapter\Memory;
-use Phalcon\Acl as PhAcl;
+use Phalcon\Acl\Enum;
 use Phalcon\Events\Manager;
 use Phalcon\Firewall\Adapter\Acl;
 use Phalcon\Mvc\Dispatcher;
@@ -90,7 +90,7 @@ public function firewallAdapterAclUseMultiModuleConfiguration(IntegrationTester
         $I->wantToTest('Firewall\Adapter\Acl - useMultiModuleConfiguration()');
 
         $acl = new Memory();
-        $acl->setDefaultAction(PhAcl::DENY);
+        $acl->setDefaultAction(Enum::DENY);
         $acl->addComponent('Module1:One', ['firstRole', 'secondRole']);
         $acl->addComponent('Module2:One', ['firstRole', 'secondRole']);
         $acl->addRole('ROLE1');

diff --git a/tests/integration/Firewall/Adapter/Annotations/GetSetDefaultAccessCest.php b/tests/integration/Firewall/Adapter/Annotations/GetSetDefaultAccessCest.php
@@ -13,7 +13,7 @@
 namespace Phalcon\Test\Integration\Firewall\Adapter\Annotations;
 
 use IntegrationTester;
-use Phalcon\Acl as PhAcl;
+use Phalcon\Acl\Enum;
 use Phalcon\Annotations\Adapter\Memory;
 use Phalcon\Firewall\Adapter\Annotations;
 
@@ -31,9 +31,9 @@ public function firewallAdapterAnnotationsGetSetDefaultAccess(IntegrationTester
         $I->wantToTest('Firewall\Adapter\Annotations - getDefaultAccess()/setDefaultAccess()');
 
         $firewall = new Annotations(new Memory());
-        $firewall->setDefaultAccess(PhAcl::ALLOW);
+        $firewall->setDefaultAccess(Enum::ALLOW);
 
         $actual = $firewall->getDefaultAccess();
-        $I->assertEquals(PhAcl::ALLOW, $actual);
+        $I->assertEquals(Enum::ALLOW, $actual);
     }
 }