diff --git a/phalcon/Acl.zep b/phalcon/Acl.zep deleted file mode 100644 index a59b6e21bc3..00000000000 --- a/phalcon/Acl.zep +++ /dev/null @@ -1,62 +0,0 @@ - -/** - * This file is part of the Phalcon Framework. - * - * (c) Phalcon Team - * - * For the full copyright and license information, please view the LICENSE.txt - * file that was distributed with this source code. - */ - -namespace Phalcon; - -/** - * This component allows you to manage ACL lists. An access control list (ACL) - * is a list of permissions attached to an object. An ACL specifies which users - * or system processes are granted access to objects, as well as what operations - * are allowed on given objects. - * - *```php - * use Phalcon\Acl; - * use Phalcon\Acl\Operation; - * use Phalcon\Acl\Subject; - * use Phalcon\Acl\Adapter\Memory; - * - * $acl = new Memory(); - * - * // Default action is deny access - * $acl->setDefaultAction(Acl::DENY); - * - * // Create some operations - * $adminsOperation = new Operation("Administrators", "Super-User role"); - * $guestsOperation = new Operation("Guests"); - * - * // Add "Guests" operation to acl - * $acl->addOperation($roleGuests); - * - * // Add "Designers" operation to acl - * $acl->addOperation("Designers"); - * - * // Define the "Customers" subject - * $customersSubject = new Subject("Customers", "Customers management"); - * - * // Add "customers" subject with a couple of operations - * $acl->addSubject($customersSubject, "search"); - * $acl->addSubject($customersSubject, ["create", "update"]); - * - * // Set access level for operations into subjects - * $acl->allow($guestsOperation->getName(), "Customers", "search"); - * $acl->allow("Guests", "Customers", "create"); - * $acl->deny($guestsOperation->getName(), "Customers", "update"); - * - * // Check whether operation has access to the operations - * $acl->isAllowed("Guests", "Customers", "edit"); // Returns 0 - * $acl->isAllowed($guestsOperation->getName(), "Customers", "search"); // Returns 1 - * $acl->isAllowed($guestsOperation->getName(), "Customers", "create"); // Returns 1 - *``` - */ -abstract class Acl -{ - const ALLOW = 1; - const DENY = 0; -} diff --git a/phalcon/Acl/Adapter/Memory.zep b/phalcon/Acl/Adapter/Memory.zep index 0b4d0af299e..9bd0f128b14 100644 --- a/phalcon/Acl/Adapter/Memory.zep +++ b/phalcon/Acl/Adapter/Memory.zep @@ -86,7 +86,7 @@ use ReflectionFunction; * } *``` */ -class Memory extends Adapter +class Memory extends AbstractAdapter { /** * Access diff --git a/phalcon/Crypt/Crypt.zep b/phalcon/Crypt/Crypt.zep index 098b4dd0cf8..c914dc43217 100644 --- a/phalcon/Crypt/Crypt.zep +++ b/phalcon/Crypt/Crypt.zep @@ -18,7 +18,7 @@ use Phalcon\Crypt\Mismatch; * Provides encryption capabilities to Phalcon applications. * * ```php - * use Phalcon\Crypt; + * use Phalcon\Crypt\Crypt; * * $crypt = new Crypt(); * @@ -95,7 +95,7 @@ class Crypt implements CryptInterface protected useSigning = true; /** - * Phalcon\Crypt constructor. + * Phalcon\Crypt\Crypt constructor. */ public function __construct(string! cipher = "aes-256-cfb", bool useSigning = false) -> void { diff --git a/phalcon/Crypt/CryptInterface.zep b/phalcon/Crypt/CryptInterface.zep index b04f82c9704..206be62ac87 100644 --- a/phalcon/Crypt/CryptInterface.zep +++ b/phalcon/Crypt/CryptInterface.zep @@ -11,7 +11,7 @@ namespace Phalcon\Crypt; /** - * Interface for Phalcon\Crypt + * Interface for Phalcon\Crypt\Crypt */ interface CryptInterface { diff --git a/phalcon/Crypt/Exception.zep b/phalcon/Crypt/Exception.zep index 13e8733d53f..c3ae4d3806e 100644 --- a/phalcon/Crypt/Exception.zep +++ b/phalcon/Crypt/Exception.zep @@ -11,7 +11,7 @@ namespace Phalcon\Crypt; /** - * Exceptions thrown in Phalcon\Crypt use this class + * Exceptions thrown in Phalcon\Crypt\Crypt use this class */ class Exception extends \Phalcon\Exception { diff --git a/phalcon/Crypt/Mismatch.zep b/phalcon/Crypt/Mismatch.zep index 9cca441e32b..10ec6c077c7 100644 --- a/phalcon/Crypt/Mismatch.zep +++ b/phalcon/Crypt/Mismatch.zep @@ -11,7 +11,7 @@ namespace Phalcon\Crypt; /** - * Exceptions thrown in Phalcon\Crypt will use this class. + * Exceptions thrown in Phalcon\Crypt\Crypt will use this class. */ class Mismatch extends Exception { diff --git a/phalcon/Db.zep b/phalcon/Db/AbstractDb.zep similarity index 69% rename from phalcon/Db.zep rename to phalcon/Db/AbstractDb.zep index 521fe85a583..e358ac36c9b 100644 --- a/phalcon/Db.zep +++ b/phalcon/Db/AbstractDb.zep @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Phalcon; +namespace Phalcon\Db; use \PDO as Pdo; @@ -45,7 +45,7 @@ use \PDO as Pdo; * "SELECT * FROM robots LIMIT 5" * ); * - * $result->setFetchMode(Db::FETCH_NUM); + * $result->setFetchMode(Enum::FETCH_NUM); * * while ($robot = $result->fetch()) { * print_r($robot); @@ -55,26 +55,8 @@ use \PDO as Pdo; * } * ``` */ -abstract class Db +abstract class AbstractDb { - const FETCH_ASSOC = \Pdo::FETCH_ASSOC; - const FETCH_BOTH = \Pdo::FETCH_BOTH; - const FETCH_BOUND = \Pdo::FETCH_BOUND; - const FETCH_CLASS = \Pdo::FETCH_CLASS; - const FETCH_CLASSTYPE = \Pdo::FETCH_CLASSTYPE; - const FETCH_COLUMN = \Pdo::FETCH_COLUMN; - const FETCH_FUNC = \Pdo::FETCH_FUNC; - const FETCH_GROUP = \Pdo::FETCH_GROUP; - const FETCH_INTO = \Pdo::FETCH_INTO; - const FETCH_KEY_PAIR = \Pdo::FETCH_KEY_PAIR; - const FETCH_LAZY = \Pdo::FETCH_LAZY; - const FETCH_NAMED = \Pdo::FETCH_NAMED; - const FETCH_NUM = \Pdo::FETCH_NUM; - const FETCH_OBJ = \Pdo::FETCH_OBJ; - const FETCH_PROPS_LATE = \Pdo::FETCH_PROPS_LATE; - const FETCH_SERIALIZE = \Pdo::FETCH_SERIALIZE; - const FETCH_UNIQUE = \Pdo::FETCH_UNIQUE; - /** * Enables/disables options in the Database component */ diff --git a/phalcon/Db/Adapter.zep b/phalcon/Db/Adapter/AbstractAdapter.zep similarity index 96% rename from phalcon/Db/Adapter.zep rename to phalcon/Db/Adapter/AbstractAdapter.zep index 1a041177392..b3d5a30b78c 100644 --- a/phalcon/Db/Adapter.zep +++ b/phalcon/Db/Adapter/AbstractAdapter.zep @@ -8,17 +8,24 @@ * file that was distributed with this source code. */ -namespace Phalcon\Db; +namespace Phalcon\Db\Adapter; -use Phalcon\Db; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Db\ColumnInterface; +use Phalcon\Db\Enum; +use Phalcon\Db\Exception; +use Phalcon\Db\Index; +use Phalcon\Db\IndexInterface; +use Phalcon\Db\Reference; +use Phalcon\Db\ReferenceInterface; +use Phalcon\Db\RawValue; use Phalcon\Events\EventsAwareInterface; use Phalcon\Events\ManagerInterface; /** * Base class for Phalcon\Db adapters */ -abstract class Adapter implements AdapterInterface, EventsAwareInterface +abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface { /** * Connection ID @@ -289,7 +296,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface let indexes = []; - for index in this->fetchAll(this->dialect->describeIndexes(table, schema), Db::FETCH_NUM) { + for index in this->fetchAll(this->dialect->describeIndexes(table, schema), Enum::FETCH_NUM) { let keyName = index[2]; if !isset indexes[keyName] { @@ -331,7 +338,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface let references = []; - for reference in this->fetchAll(this->dialect->describeReferences(table, schema), Db::FETCH_NUM) { + for reference in this->fetchAll(this->dialect->describeReferences(table, schema), Enum::FETCH_NUM) { let constraintName = reference[2]; if !isset references[constraintName] { @@ -489,7 +496,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface * // Getting all robots with associative indexes only * $robots = $connection->fetchAll( * "SELECT * FROM robots", - * \Phalcon\Db::FETCH_ASSOC + * \Phalcon\Db\Enum::FETCH_ASSOC * ); * * foreach ($robots as $robot) { @@ -499,7 +506,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface * // Getting all robots that contains word "robot" withing the name * $robots = $connection->fetchAll( * "SELECT * FROM robots WHERE name LIKE :name", - * \Phalcon\Db::FETCH_ASSOC, + * \Phalcon\Db\Enum::FETCH_ASSOC, * [ * "name" => "%robot%", * ] @@ -509,7 +516,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface * } *``` */ - public function fetchAll(string sqlQuery, int fetchMode = Db::FETCH_ASSOC, var bindParams = null, var bindTypes = null) -> array + public function fetchAll(string sqlQuery, int fetchMode = Enum::FETCH_ASSOC, var bindParams = null, var bindTypes = null) -> array { var result; @@ -544,7 +551,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface { var row, columnValue; - let row = this->fetchOne(sqlQuery, Db::FETCH_BOTH, placeholders); + let row = this->fetchOne(sqlQuery, Enum::FETCH_BOTH, placeholders); if !fetch columnValue, row[column] { return false; @@ -564,12 +571,12 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface * // Getting first robot with associative indexes only * $robot = $connection->fetchOne( * "SELECT * FROM robots", - * \Phalcon\Db::FETCH_ASSOC + * \Phalcon\Db\Enum::FETCH_ASSOC * ); * print_r($robot); *``` */ - public function fetchOne(string! sqlQuery, var fetchMode = Db::FETCH_ASSOC, var bindParams = null, var bindTypes = null) -> array + public function fetchOne(string! sqlQuery, var fetchMode = Enum::FETCH_ASSOC, var bindParams = null, var bindTypes = null) -> array { var result; @@ -888,7 +895,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface let tables = this->fetchAll( this->dialect->listTables(schemaName), - Db::FETCH_NUM + Enum::FETCH_NUM ); for table in tables { @@ -915,7 +922,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface let tables = this->fetchAll( this->dialect->listViews(schemaName), - Db::FETCH_NUM + Enum::FETCH_NUM ); for table in tables { @@ -1050,7 +1057,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface */ public function tableExists(string! tableName, string! schemaName = null) -> bool { - return this->fetchOne(this->dialect->tableExists(tableName, schemaName), Db::FETCH_NUM)[0] > 0; + return this->fetchOne(this->dialect->tableExists(tableName, schemaName), Enum::FETCH_NUM)[0] > 0; } /** @@ -1072,7 +1079,7 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface return []; } - return this->fetchAll(sql, Db::FETCH_ASSOC)[0]; + return this->fetchAll(sql, Enum::FETCH_ASSOC)[0]; } /** @@ -1274,6 +1281,6 @@ abstract class Adapter implements AdapterInterface, EventsAwareInterface */ public function viewExists(string! viewName, string! schemaName = null) -> bool { - return this->fetchOne(this->dialect->viewExists(viewName, schemaName), Db::FETCH_NUM)[0] > 0; + return this->fetchOne(this->dialect->viewExists(viewName, schemaName), Enum::FETCH_NUM)[0] > 0; } } diff --git a/phalcon/Db/AdapterInterface.zep b/phalcon/Db/Adapter/AdapterInterface.zep similarity index 98% rename from phalcon/Db/AdapterInterface.zep rename to phalcon/Db/Adapter/AdapterInterface.zep index a91f04f7382..4c0eeddd1c2 100644 --- a/phalcon/Db/AdapterInterface.zep +++ b/phalcon/Db/Adapter/AdapterInterface.zep @@ -8,7 +8,12 @@ * file that was distributed with this source code. */ -namespace Phalcon\Db; +namespace Phalcon\Db\Adapter; + +use Phalcon\Db\ColumnInterface; +use Phalcon\Db\IndexInterface; +use Phalcon\Db\RawValue; +use Phalcon\Db\ReferenceInterface; /** * Interface for Phalcon\Db adapters diff --git a/phalcon/Db/Adapter/Pdo.zep b/phalcon/Db/Adapter/Pdo.zep index 2fbfb489fe6..78817f2101f 100644 --- a/phalcon/Db/Adapter/Pdo.zep +++ b/phalcon/Db/Adapter/Pdo.zep @@ -10,7 +10,7 @@ namespace Phalcon\Db\Adapter; -use Phalcon\Db\Adapter; +use Phalcon\Db\Adapter\AbstractAdapter; use Phalcon\Db\Column; use Phalcon\Db\Exception; use Phalcon\Db\Result\Pdo as ResultPdo; @@ -35,7 +35,7 @@ use Phalcon\Events\ManagerInterface; * $connection = new Mysql($config); *``` */ -abstract class Pdo extends Adapter +abstract class Pdo extends AbstractAdapter { /** * Last affected rows diff --git a/phalcon/Db/Adapter/Pdo/Mysql.zep b/phalcon/Db/Adapter/Pdo/Mysql.zep index b3657b95b25..21bf9ba608f 100644 --- a/phalcon/Db/Adapter/Pdo/Mysql.zep +++ b/phalcon/Db/Adapter/Pdo/Mysql.zep @@ -10,10 +10,10 @@ namespace Phalcon\Db\Adapter\Pdo; -use Phalcon\Db; use Phalcon\Db\Adapter\Pdo as PdoAdapter; use Phalcon\Db\Column; use Phalcon\Db\ColumnInterface; +use Phalcon\Db\Enum; use Phalcon\Db\Exception; use Phalcon\Db\Index; use Phalcon\Db\IndexInterface; @@ -97,7 +97,7 @@ class Mysql extends PdoAdapter let fields = this->fetchAll( this->dialect->describeColumns(table, schema), - Db::FETCH_NUM + Enum::FETCH_NUM ); /** @@ -465,7 +465,7 @@ class Mysql extends PdoAdapter let indexes = []; - for index in this->fetchAll(this->dialect->describeIndexes(table, schema), Db::FETCH_ASSOC) { + for index in this->fetchAll(this->dialect->describeIndexes(table, schema), Enum::FETCH_ASSOC) { let keyName = index["Key_name"]; let indexType = index["Index_type"]; @@ -523,7 +523,7 @@ class Mysql extends PdoAdapter let references = []; - for reference in this->fetchAll(this->dialect->describeReferences(table, schema), Db::FETCH_NUM) { + for reference in this->fetchAll(this->dialect->describeReferences(table, schema), Enum::FETCH_NUM) { let constraintName = reference[2]; diff --git a/phalcon/Db/Adapter/Pdo/Postgresql.zep b/phalcon/Db/Adapter/Pdo/Postgresql.zep index f9f681c6ecf..6510ce48982 100644 --- a/phalcon/Db/Adapter/Pdo/Postgresql.zep +++ b/phalcon/Db/Adapter/Pdo/Postgresql.zep @@ -10,10 +10,10 @@ namespace Phalcon\Db\Adapter\Pdo; -use Phalcon\Db; use Phalcon\Db\Adapter\Pdo as PdoAdapter; use Phalcon\Db\Column; use Phalcon\Db\ColumnInterface; +use Phalcon\Db\Enum; use Phalcon\Db\Exception; use Phalcon\Db\RawValue; use Phalcon\Db\Reference; @@ -165,7 +165,7 @@ class Postgresql extends PdoAdapter */ let fields = this->fetchAll( this->dialect->describeColumns(table, schema), - Db::FETCH_NUM + Enum::FETCH_NUM ); for field in fields { @@ -542,7 +542,7 @@ class Postgresql extends PdoAdapter let references = []; - for reference in this->fetchAll(this->dialect->describeReferences(table, schema), Db::FETCH_NUM) { + for reference in this->fetchAll(this->dialect->describeReferences(table, schema), Enum::FETCH_NUM) { let constraintName = reference[2]; if !isset references[constraintName] { diff --git a/phalcon/Db/Adapter/Pdo/Sqlite.zep b/phalcon/Db/Adapter/Pdo/Sqlite.zep index 1ba9312b195..ff92fd7c56a 100644 --- a/phalcon/Db/Adapter/Pdo/Sqlite.zep +++ b/phalcon/Db/Adapter/Pdo/Sqlite.zep @@ -10,10 +10,10 @@ namespace Phalcon\Db\Adapter\Pdo; -use Phalcon\Db; use Phalcon\Db\Adapter\Pdo as PdoAdapter; use Phalcon\Db\Column; use Phalcon\Db\ColumnInterface; +use Phalcon\Db\Enum; use Phalcon\Db\Exception; use Phalcon\Db\Index; use Phalcon\Db\IndexInterface; @@ -109,7 +109,7 @@ class Sqlite extends PdoAdapter */ let fields = this->fetchAll( this->dialect->describeColumns(table, schema), - Db::FETCH_NUM + Enum::FETCH_NUM ); for field in fields { @@ -328,7 +328,7 @@ class Sqlite extends PdoAdapter let indexes = []; - for index in this->fetchAll(this->dialect->describeIndexes(table, schema), Db::FETCH_ASSOC) { + for index in this->fetchAll(this->dialect->describeIndexes(table, schema), Enum::FETCH_ASSOC) { let keyName = index["name"]; if !isset indexes[keyName] { @@ -343,7 +343,7 @@ class Sqlite extends PdoAdapter let describeIndexes = this->fetchAll( this->dialect->describeIndex(keyName), - Db::FETCH_ASSOC + Enum::FETCH_ASSOC ); for describeIndex in describeIndexes { @@ -391,7 +391,7 @@ class Sqlite extends PdoAdapter let references = []; - for number, reference in this->fetchAll(this->dialect->describeReferences(table, schema), Db::FETCH_NUM) { + for number, reference in this->fetchAll(this->dialect->describeReferences(table, schema), Enum::FETCH_NUM) { let constraintName = "foreign_key_" . number; if !isset references[constraintName] { diff --git a/phalcon/Db/Enum.zep b/phalcon/Db/Enum.zep new file mode 100644 index 00000000000..430c3329e29 --- /dev/null +++ b/phalcon/Db/Enum.zep @@ -0,0 +1,35 @@ + +/** + * This file is part of the Phalcon Framework. + * + * (c) Phalcon Team + * + * For the full copyright and license information, please view the LICENSE.txt + * file that was distributed with this source code. + */ + +namespace Phalcon\Db; + +/** + * Constants for Phalcon\Db + */ +class Enum +{ + const FETCH_ASSOC = \Pdo::FETCH_ASSOC; + const FETCH_BOTH = \Pdo::FETCH_BOTH; + const FETCH_BOUND = \Pdo::FETCH_BOUND; + const FETCH_CLASS = \Pdo::FETCH_CLASS; + const FETCH_CLASSTYPE = \Pdo::FETCH_CLASSTYPE; + const FETCH_COLUMN = \Pdo::FETCH_COLUMN; + const FETCH_FUNC = \Pdo::FETCH_FUNC; + const FETCH_GROUP = \Pdo::FETCH_GROUP; + const FETCH_INTO = \Pdo::FETCH_INTO; + const FETCH_KEY_PAIR = \Pdo::FETCH_KEY_PAIR; + const FETCH_LAZY = \Pdo::FETCH_LAZY; + const FETCH_NAMED = \Pdo::FETCH_NAMED; + const FETCH_NUM = \Pdo::FETCH_NUM; + const FETCH_OBJ = \Pdo::FETCH_OBJ; + const FETCH_PROPS_LATE = \Pdo::FETCH_PROPS_LATE; + const FETCH_SERIALIZE = \Pdo::FETCH_SERIALIZE; + const FETCH_UNIQUE = \Pdo::FETCH_UNIQUE; +} diff --git a/phalcon/Db/Result/Pdo.zep b/phalcon/Db/Result/Pdo.zep index 121783835c6..e0ec14e3aa6 100644 --- a/phalcon/Db/Result/Pdo.zep +++ b/phalcon/Db/Result/Pdo.zep @@ -10,7 +10,7 @@ namespace Phalcon\Db\Result; -use Phalcon\Db; +use Phalcon\Db\Enum; use Phalcon\Db\ResultInterface; %{ @@ -24,7 +24,7 @@ use Phalcon\Db\ResultInterface; * $result = $connection->query("SELECT * FROM robots ORDER BY name"); * * $result->setFetchMode( - * \Phalcon\Db::FETCH_NUM + * \Phalcon\Db\Enum::FETCH_NUM * ); * * while ($robot = $result->fetchArray()) { @@ -43,7 +43,7 @@ class Pdo implements ResultInterface /** * Active fetch mode */ - protected fetchMode = Db::FETCH_OBJ; + protected fetchMode = Enum::FETCH_OBJ; /** * Internal resultset @@ -146,7 +146,7 @@ class Pdo implements ResultInterface * $result = $connection->query("SELECT * FROM robots ORDER BY name"); * * $result->setFetchMode( - * \Phalcon\Db::FETCH_OBJ + * \Phalcon\Enum::FETCH_OBJ * ); * * while ($robot = $result->fetch()) { @@ -186,7 +186,7 @@ class Pdo implements ResultInterface return pdoStatement->fetchAll(); } - if fetchStyle == Db::FETCH_CLASS { + if fetchStyle == Enum::FETCH_CLASS { return pdoStatement->fetchAll( fetchStyle, fetchArgument, @@ -194,7 +194,7 @@ class Pdo implements ResultInterface ); } - if fetchStyle == Db::FETCH_COLUMN || fetchStyle == Db::FETCH_FUNC { + if fetchStyle == Enum::FETCH_COLUMN || fetchStyle == Enum::FETCH_FUNC { return pdoStatement->fetchAll(fetchStyle, fetchArgument); } @@ -210,7 +210,7 @@ class Pdo implements ResultInterface * $result = $connection->query("SELECT * FROM robots ORDER BY name"); * * $result->setFetchMode( - * \Phalcon\Db::FETCH_NUM + * \Phalcon\Enum::FETCH_NUM * ); * * while ($robot = result->fetchArray()) { @@ -309,22 +309,22 @@ class Pdo implements ResultInterface *```php * // Return array with integer indexes * $result->setFetchMode( - * \Phalcon\Db::FETCH_NUM + * \Phalcon\Enum::FETCH_NUM * ); * * // Return associative array without integer indexes * $result->setFetchMode( - * \Phalcon\Db::FETCH_ASSOC + * \Phalcon\Enum::FETCH_ASSOC * ); * * // Return associative array together with integer indexes * $result->setFetchMode( - * \Phalcon\Db::FETCH_BOTH + * \Phalcon\Enum::FETCH_BOTH * ); * * // Return an object * $result->setFetchMode( - * \Phalcon\Db::FETCH_OBJ + * \Phalcon\Enum::FETCH_OBJ * ); *``` */ @@ -334,11 +334,11 @@ class Pdo implements ResultInterface let pdoStatement = this->pdoStatement; - if fetchMode == Db::FETCH_CLASS || fetchMode == Db::FETCH_INTO { + if fetchMode == Enum::FETCH_CLASS || fetchMode == Enum::FETCH_INTO { if !pdoStatement->setFetchMode(fetchMode, colNoOrClassNameOrObject, ctorargs) { return false; } - } elseif fetchMode == Db::FETCH_COLUMN { + } elseif fetchMode == Enum::FETCH_COLUMN { if !pdoStatement->setFetchMode(fetchMode, colNoOrClassNameOrObject) { return false; } diff --git a/phalcon/Di/FactoryDefault.zep b/phalcon/Di/FactoryDefault.zep index feff8d8b88b..381869c1958 100644 --- a/phalcon/Di/FactoryDefault.zep +++ b/phalcon/Di/FactoryDefault.zep @@ -34,10 +34,10 @@ class FactoryDefault extends \Phalcon\Di let this->services = [ "annotations": new Service("Phalcon\\Annotations\\Adapter\\Memory", true), "assets": new Service("Phalcon\\Assets\\Manager", true), - "crypt": new Service("Phalcon\\Crypt", true), + "crypt": new Service("Phalcon\\Crypt\\Crypt", true), "cookies": new Service("Phalcon\\Http\\Response\\Cookies", true), "dispatcher": new Service("Phalcon\\Mvc\\Dispatcher", true), - "escaper": new Service("Phalcon\\Escaper", true), + "escaper": new Service("Phalcon\\Escaper\\Escaper", true), "eventsManager": new Service("Phalcon\\Events\\Manager", true), "flash": new Service("Phalcon\\Flash\\Direct", true), "flashSession": new Service("Phalcon\\Flash\\Session", true), @@ -47,7 +47,7 @@ class FactoryDefault extends \Phalcon\Di "request": new Service("Phalcon\\Http\\Request", true), "response": new Service("Phalcon\\Http\\Response", true), "router": new Service("Phalcon\\Mvc\\Router", true), - "security": new Service("Phalcon\\Security", true), + "security": new Service("Phalcon\\Security\\Security", true), "tag": new Service("Phalcon\\Tag", true), "transactionManager": new Service("Phalcon\\Mvc\\Model\\Transaction\\Manager", true), "url": new Service("Phalcon\\Url", true) diff --git a/phalcon/Di/FactoryDefault/Cli.zep b/phalcon/Di/FactoryDefault/Cli.zep index f1df7f1882f..ab97c96e074 100644 --- a/phalcon/Di/FactoryDefault/Cli.zep +++ b/phalcon/Di/FactoryDefault/Cli.zep @@ -38,13 +38,13 @@ class Cli extends FactoryDefault let this->services = [ "annotations": new Service("Phalcon\\Annotations\\Adapter\\Memory", true), "dispatcher": new Service("Phalcon\\Cli\\Dispatcher", true), - "escaper": new Service("Phalcon\\Escaper", true), + "escaper": new Service("Phalcon\\Escaper\\Escaper", true), "eventsManager": new Service("Phalcon\\Events\\Manager", true), "filter": new Service(filter->newInstance(), true), "modelsManager": new Service("Phalcon\\Mvc\\Model\\Manager", true), "modelsMetadata": new Service("Phalcon\\Mvc\\Model\\MetaData\\Memory", true), "router": new Service("Phalcon\\Cli\\Router", true), - "security": new Service("Phalcon\\Security", true), + "security": new Service("Phalcon\\Security\\Security", true), "transactionManager": new Service("Phalcon\\Mvc\\Model\\Transaction\\Manager", true) ]; } diff --git a/phalcon/Di/Injectable.zep b/phalcon/Di/Injectable.zep index 7529a04d949..82d2155be2b 100644 --- a/phalcon/Di/Injectable.zep +++ b/phalcon/Di/Injectable.zep @@ -33,11 +33,11 @@ use Phalcon\Session\BagInterface; * @property \Phalcon\Flash\Session $flashSession * @property \Phalcon\Session\ManagerInterface $session * @property \Phalcon\Events\Manager|\Phalcon\Events\ManagerInterface $eventsManager - * @property \Phalcon\Db\AdapterInterface $db - * @property \Phalcon\Security $security - * @property \Phalcon\Crypt|\Phalcon\CryptInterface $crypt + * @property \Phalcon\Db\Adapter\AdapterInterface $db + * @property \Phalcon\Security\Security $security + * @property \Phalcon\Crypt\Crypt|\Phalcon\Crypt\CryptInterface $crypt * @property \Phalcon\Tag $tag - * @property \Phalcon\Escaper|\Phalcon\EscaperInterface $escaper + * @property \Phalcon\Escaper|\Phalcon\Escaper\EscaperInterface $escaper * @property \Phalcon\Annotations\Adapter\Memory|\Phalcon\Annotations\Adapter $annotations * @property \Phalcon\Mvc\Model\Manager|\Phalcon\Mvc\Model\ManagerInterface $modelsManager * @property \Phalcon\Mvc\Model\MetaData\Memory|\Phalcon\Mvc\Model\MetadataInterface $modelsMetadata diff --git a/phalcon/Escaper/Escaper.zep b/phalcon/Escaper/Escaper.zep index a865561eab7..1923185eed4 100644 --- a/phalcon/Escaper/Escaper.zep +++ b/phalcon/Escaper/Escaper.zep @@ -10,7 +10,7 @@ namespace Phalcon\Escaper; -use Phalcon\EscaperInterface; +use Phalcon\Escaper\EscaperInterface; use Phalcon\Escaper\Exception; /** diff --git a/phalcon/Firewall/Adapter/AbstractAdapter.zep b/phalcon/Firewall/Adapter/AbstractAdapter.zep index e6e4ae78fe1..5532a0ba09b 100644 --- a/phalcon/Firewall/Adapter/AbstractAdapter.zep +++ b/phalcon/Firewall/Adapter/AbstractAdapter.zep @@ -11,7 +11,7 @@ namespace Phalcon\Firewall\Adapter; use Closure; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\RoleAware; use Phalcon\Cache\Adapter\AdapterInterface as CacheAdapterInterface; use Phalcon\DiInterface; @@ -51,7 +51,7 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface * Default access * @var int */ - protected defaultAccess = Acl::DENY { get }; + protected defaultAccess = Enum::DENY { get }; /** * Events manager @@ -111,7 +111,7 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface } /** - * Sets the default access level (Phalcon\Acl::ALLOW or Phalcon\Acl::DENY) + * Sets the default access level (Phalcon\Acl\Enum::ALLOW or Phalcon\Acl\Enum::DENY) */ public function setDefaultAccess(int defaultAccess) -> { diff --git a/phalcon/Flash/AbstractFlash.zep b/phalcon/Flash/AbstractFlash.zep index 0caa61e0282..1ac29592289 100644 --- a/phalcon/Flash/AbstractFlash.zep +++ b/phalcon/Flash/AbstractFlash.zep @@ -13,7 +13,7 @@ namespace Phalcon\Flash; use Phalcon\Di; use Phalcon\DiInterface; use Phalcon\Di\InjectionAwareInterface; -use Phalcon\EscaperInterface; +use Phalcon\Escaper\EscaperInterface; use Phalcon\Flash\Exception; /** diff --git a/phalcon/Forms/Element/Element.zep b/phalcon/Forms/Element/AbstractElement.zep similarity index 99% rename from phalcon/Forms/Element/Element.zep rename to phalcon/Forms/Element/AbstractElement.zep index 8f6e3cc02d2..75811aa3b0c 100644 --- a/phalcon/Forms/Element/Element.zep +++ b/phalcon/Forms/Element/AbstractElement.zep @@ -11,10 +11,11 @@ namespace Phalcon\Forms\Element; use InvalidArgumentException; -use Phalcon\Tag; +use Phalcon\Forms\Form; use Phalcon\Forms\Exception; use Phalcon\Messages\MessageInterface; use Phalcon\Messages\Messages; +use Phalcon\Tag; use Phalcon\Validation\ValidatorInterface; /** diff --git a/phalcon/Forms/Form.zep b/phalcon/Forms/Form.zep index ab1eaca2114..03d3d880e85 100644 --- a/phalcon/Forms/Form.zep +++ b/phalcon/Forms/Form.zep @@ -17,7 +17,7 @@ use Phalcon\DiInterface; use Phalcon\FilterInterface; use Phalcon\Filter\FilterInterface; use Phalcon\Forms\Exception; -use Phalcon\Forms\ElementInterface; +use Phalcon\Forms\Element\ElementInterface; use Phalcon\Html\Attributes; use Phalcon\Html\Attributes\AttributesInterface; use Phalcon\Messages\Messages; diff --git a/phalcon/Html/Helper/AbstractHelper.zep b/phalcon/Html/Helper/AbstractHelper.zep index a17ff3c1ac6..5d42c84f64c 100644 --- a/phalcon/Html/Helper/AbstractHelper.zep +++ b/phalcon/Html/Helper/AbstractHelper.zep @@ -11,7 +11,7 @@ namespace Phalcon\Html\Helper; use Phalcon\Html\Exception; -use Phalcon\EscaperInterface; +use Phalcon\Escaper\EscaperInterface; /** * Phalcon\Html\Helper\AbstractHelper @@ -56,7 +56,7 @@ abstract class AbstractHelper protected function renderElement(string! tag, array! attributes = []) -> string { var attrs, escapedAttrs; - + let escapedAttrs = ""; if count(attributes) > 0 { let attrs = this->orderAttributes([], attributes), @@ -77,7 +77,7 @@ abstract class AbstractHelper protected function orderAttributes(array overrides, array attributes) -> array { var intersect, order, results; - + let order = [ "rel" : null, "type" : null, diff --git a/phalcon/Html/Tag.zep b/phalcon/Html/Tag.zep index 702f3febd06..c508cdb1e07 100644 --- a/phalcon/Html/Tag.zep +++ b/phalcon/Html/Tag.zep @@ -12,8 +12,8 @@ namespace Phalcon\Html; use Phalcon\DiInterface; use Phalcon\Di\InjectionAwareInterface; -use Phalcon\Escaper; -use Phalcon\EscaperInterface; +use Phalcon\Escaper\Escaper; +use Phalcon\Escaper\EscaperInterface; use Phalcon\Helper\Arr; use Phalcon\Html\Exception; use Phalcon\UrlInterface; diff --git a/phalcon/Html/TagFactory.zep b/phalcon/Html/TagFactory.zep index 5590800bc9f..9b814026c09 100644 --- a/phalcon/Html/TagFactory.zep +++ b/phalcon/Html/TagFactory.zep @@ -10,8 +10,8 @@ namespace Phalcon\Html; -use Phalcon\Escaper; -use Phalcon\EscaperInterface; +use Phalcon\Escaper\Escaper; +use Phalcon\Escaper\EscaperInterface; use Phalcon\Factory\AbstractFactory; /** diff --git a/phalcon/Http/Cookie.zep b/phalcon/Http/Cookie.zep index 0f53a047a66..1a2d89471dc 100644 --- a/phalcon/Http/Cookie.zep +++ b/phalcon/Http/Cookie.zep @@ -11,7 +11,7 @@ namespace Phalcon\Http; use Phalcon\DiInterface; -use Phalcon\CryptInterface; +use Phalcon\Crypt\CryptInterface; use Phalcon\Di\InjectionAwareInterface; use Phalcon\Filter\FilterInterface; use Phalcon\Http\Response\Exception; diff --git a/phalcon/Http/Response/Cookies.zep b/phalcon/Http/Response/Cookies.zep index f28030c3620..33ffa8cf7db 100644 --- a/phalcon/Http/Response/Cookies.zep +++ b/phalcon/Http/Response/Cookies.zep @@ -29,7 +29,7 @@ use Phalcon\Http\Cookie\Exception; * * ```php * use Phalcon\Di; - * use Phalcon\Crypt; + * use Phalcon\Crypt\Crypt; * use Phalcon\Http\Response\Cookies; * * $di = new Di(); diff --git a/phalcon/Mvc/Collection/ManagerInterface.zep b/phalcon/Mvc/Collection/ManagerInterface.zep index c0778f382fc..b3eeb52aae6 100644 --- a/phalcon/Mvc/Collection/ManagerInterface.zep +++ b/phalcon/Mvc/Collection/ManagerInterface.zep @@ -10,7 +10,7 @@ namespace Phalcon\Mvc\Collection; -use Phalcon\Db\AdapterInterface; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Mvc\CollectionInterface; use Phalcon\Mvc\Collection\BehaviorInterface; use Phalcon\Events\ManagerInterface as EventsManagerInterface; diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep index 636336bad5d..87eeeb43652 100644 --- a/phalcon/Mvc/Model.zep +++ b/phalcon/Mvc/Model.zep @@ -10,11 +10,12 @@ namespace Phalcon\Mvc; use JsonSerializable; -use Phalcon\Db\AdapterInterface; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Db\Column; use Phalcon\Db\DialectInterface; -use Phalcon\Di\InjectionAwareInterface; +use Phalcon\Db\Enum; use Phalcon\Db\RawValue; +use Phalcon\Di\InjectionAwareInterface; use Phalcon\Di; use Phalcon\DiInterface; use Phalcon\Events\ManagerInterface as EventsManagerInterface; @@ -2213,7 +2214,7 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface let row = readConnection->fetchOne( tables, - \Phalcon\Db::FETCH_ASSOC, + Enum::FETCH_ASSOC, uniqueParams, this->uniqueTypes ); diff --git a/phalcon/Mvc/Model/Manager.zep b/phalcon/Mvc/Model/Manager.zep index f7ff80a131e..17eaf1507c7 100644 --- a/phalcon/Mvc/Model/Manager.zep +++ b/phalcon/Mvc/Model/Manager.zep @@ -15,7 +15,7 @@ use Phalcon\Mvc\Model\Relation; use Phalcon\Mvc\Model\RelationInterface; use Phalcon\Mvc\Model\Exception; use Phalcon\Mvc\ModelInterface; -use Phalcon\Db\AdapterInterface; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Mvc\Model\ResultsetInterface; use Phalcon\Mvc\Model\ManagerInterface; use Phalcon\Di\InjectionAwareInterface; diff --git a/phalcon/Mvc/Model/ManagerInterface.zep b/phalcon/Mvc/Model/ManagerInterface.zep index f084c38037f..868675ce08a 100644 --- a/phalcon/Mvc/Model/ManagerInterface.zep +++ b/phalcon/Mvc/Model/ManagerInterface.zep @@ -10,7 +10,7 @@ namespace Phalcon\Mvc\Model; -use Phalcon\Db\AdapterInterface; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Mvc\ModelInterface; use Phalcon\Mvc\Model\BehaviorInterface; use Phalcon\Mvc\Model\RelationInterface; diff --git a/phalcon/Mvc/Model/MetaData/Strategy/Introspection.zep b/phalcon/Mvc/Model/MetaData/Strategy/Introspection.zep index d42a30a9f28..b22c925ba79 100644 --- a/phalcon/Mvc/Model/MetaData/Strategy/Introspection.zep +++ b/phalcon/Mvc/Model/MetaData/Strategy/Introspection.zep @@ -11,7 +11,7 @@ namespace Phalcon\Mvc\Model\MetaData\Strategy; use Phalcon\DiInterface; -use Phalcon\Db\AdapterInterface; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\Db\Column; use Phalcon\Mvc\ModelInterface; use Phalcon\Mvc\Model\Exception; diff --git a/phalcon/Mvc/Model/Query.zep b/phalcon/Mvc/Model/Query.zep index 37383555193..0eabf6b734d 100644 --- a/phalcon/Mvc/Model/Query.zep +++ b/phalcon/Mvc/Model/Query.zep @@ -13,7 +13,7 @@ namespace Phalcon\Mvc\Model; use Phalcon\Db\Column; use Phalcon\Db\RawValue; use Phalcon\Db\ResultInterface; -use Phalcon\Db\AdapterInterface; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\DiInterface; use Phalcon\Helper\Arr; use Phalcon\Mvc\Model\Row; diff --git a/phalcon/Mvc/Model/Resultset.zep b/phalcon/Mvc/Model/Resultset.zep index 8cac7688db7..2c77ca0ea9d 100644 --- a/phalcon/Mvc/Model/Resultset.zep +++ b/phalcon/Mvc/Model/Resultset.zep @@ -15,7 +15,7 @@ use Closure; use Countable; use Iterator; use JsonSerializable; -use Phalcon\Db; +use Phalcon\Db\Enum; use Phalcon\Messages\MessageInterface; use Phalcon\Mvc\Model; use Phalcon\Mvc\ModelInterface; @@ -133,7 +133,7 @@ abstract class Resultset /** * Do the fetch using only associative indexes */ - result->setFetchMode(Db::FETCH_ASSOC); + result->setFetchMode(Enum::FETCH_ASSOC); /** * Update the row-count diff --git a/phalcon/Mvc/Model/Transaction.zep b/phalcon/Mvc/Model/Transaction.zep index daf48acaa61..a36823fbfc2 100644 --- a/phalcon/Mvc/Model/Transaction.zep +++ b/phalcon/Mvc/Model/Transaction.zep @@ -123,7 +123,7 @@ class Transaction implements TransactionInterface /** * Returns the connection related to transaction */ - public function getConnection() -> <\Phalcon\Db\AdapterInterface> + public function getConnection() -> <\Phalcon\Db\Adapter\AdapterInterface> { if this->rollbackOnAbort { if connection_aborted() { diff --git a/phalcon/Mvc/Model/TransactionInterface.zep b/phalcon/Mvc/Model/TransactionInterface.zep index 3bcc703a217..2d10ec4d3ab 100644 --- a/phalcon/Mvc/Model/TransactionInterface.zep +++ b/phalcon/Mvc/Model/TransactionInterface.zep @@ -33,7 +33,7 @@ interface TransactionInterface /** * Returns connection related to transaction */ - public function getConnection() -> <\Phalcon\Db\AdapterInterface>; + public function getConnection() -> <\Phalcon\Db\Adapter\AdapterInterface>; /** * Returns validations messages from last save try diff --git a/phalcon/Mvc/ModelInterface.zep b/phalcon/Mvc/ModelInterface.zep index f3a47bc8a60..632a0f547f9 100644 --- a/phalcon/Mvc/ModelInterface.zep +++ b/phalcon/Mvc/ModelInterface.zep @@ -9,7 +9,7 @@ namespace Phalcon\Mvc; -use Phalcon\Db\AdapterInterface; +use Phalcon\Db\Adapter\AdapterInterface; use Phalcon\DiInterface; use Phalcon\Messages\MessageInterface; use Phalcon\Mvc\Model\CriteriaInterface; diff --git a/phalcon/Paginator/Adapter/QueryBuilder.zep b/phalcon/Paginator/Adapter/QueryBuilder.zep index 8de597143ac..73ebc22f669 100644 --- a/phalcon/Paginator/Adapter/QueryBuilder.zep +++ b/phalcon/Paginator/Adapter/QueryBuilder.zep @@ -10,11 +10,11 @@ namespace Phalcon\Paginator\Adapter; +use Phalcon\Db\Enum; use Phalcon\Mvc\Model\Query\Builder; use Phalcon\Paginator\Adapter\AbstractAdapter; use Phalcon\Paginator\RepositoryInterface; use Phalcon\Paginator\Exception; -use Phalcon\Db; /** * Phalcon\Paginator\Adapter\QueryBuilder @@ -224,7 +224,7 @@ class QueryBuilder extends AbstractAdapter let row = db->fetchOne( "SELECT COUNT(*) as \"rowcount\" FROM (" . sql["sql"] . ") as T1", - Db::FETCH_ASSOC, + Enum::FETCH_ASSOC, sql["bind"] ); diff --git a/phalcon/Security/Exception.zep b/phalcon/Security/Exception.zep index 96c4b90d8e9..782799ffcf6 100644 --- a/phalcon/Security/Exception.zep +++ b/phalcon/Security/Exception.zep @@ -13,7 +13,7 @@ namespace Phalcon\Security; /** * Phalcon\Security\Exception * - * Exceptions thrown in Phalcon\Security will use this class + * Exceptions thrown in Phalcon\Security\Security will use this class */ class Exception extends \Phalcon\Exception { diff --git a/phalcon/Security/Security.zep b/phalcon/Security/Security.zep index 2cc9e0f9b21..286d2d87b3a 100644 --- a/phalcon/Security/Security.zep +++ b/phalcon/Security/Security.zep @@ -58,7 +58,7 @@ class Security implements InjectionAwareInterface protected workFactor = 8 { set, get }; /** - * Phalcon\Security constructor + * Phalcon\Security\Security constructor */ public function __construct() -> void { diff --git a/phalcon/Tag.zep b/phalcon/Tag.zep index 642c625e9c7..f950392c9e1 100644 --- a/phalcon/Tag.zep +++ b/phalcon/Tag.zep @@ -10,6 +10,7 @@ namespace Phalcon; +use Phalcon\Escaper\EscaperInterface; use Phalcon\Tag\Select; use Phalcon\Tag\Exception; use Phalcon\UrlInterface; diff --git a/phalcon/Tag/Select.zep b/phalcon/Tag/Select.zep index 6da609b8d04..ceb83501c03 100644 --- a/phalcon/Tag/Select.zep +++ b/phalcon/Tag/Select.zep @@ -12,7 +12,7 @@ namespace Phalcon\Tag; use Phalcon\Tag\Exception; use Phalcon\Tag as BaseTag; -use Phalcon\EscaperInterface; +use Phalcon\Escaper\EscaperInterface; use Phalcon\Mvc\Model\ResulsetInterface; /** diff --git a/tests/_data/fixtures/Traits/DiTrait.php b/tests/_data/fixtures/Traits/DiTrait.php index 9b15a0a712f..48e76f448a7 100644 --- a/tests/_data/fixtures/Traits/DiTrait.php +++ b/tests/_data/fixtures/Traits/DiTrait.php @@ -22,9 +22,8 @@ use Phalcon\Annotations\Adapter\Memory as AnnotationsMemory; use Phalcon\Cache\Adapter\Libmemcached as StorageLibmemcached; use Phalcon\Cache\Adapter\Stream as StorageStream; -use Phalcon\Cache\Backend\Libmemcached; use Phalcon\Cli\Console as CliConsole; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Db\Adapter\Pdo\Mysql; use Phalcon\Db\Adapter\Pdo\Postgresql; use Phalcon\Db\Adapter\Pdo\Sqlite; @@ -32,7 +31,7 @@ use Phalcon\Di\FactoryDefault; use Phalcon\Di\FactoryDefault\Cli as CliFactoryDefault; use Phalcon\DiInterface; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Events\Manager as EventsManager; use Phalcon\Filter; use Phalcon\Http\Request; diff --git a/tests/unit/Acl/Adapter/Memory/AllowCest.php b/tests/unit/Acl/Adapter/Memory/AllowCest.php index d84246946e2..180c4c23655 100644 --- a/tests/unit/Acl/Adapter/Memory/AllowCest.php +++ b/tests/unit/Acl/Adapter/Memory/AllowCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; use Exception; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use Phalcon\Acl\Component; use Phalcon\Acl\Exception as AclException; @@ -37,7 +37,7 @@ public function aclAdapterMemoryAllow(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests'); @@ -74,7 +74,7 @@ public function aclAdapterMemoryAllowWildcard(UnitTester $I) $I->wantToTest('Acl\Adapter\Memory - allow() - wildcard'); $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); @@ -84,7 +84,7 @@ public function aclAdapterMemoryAllowWildcard(UnitTester $I) ); $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); @@ -94,7 +94,7 @@ public function aclAdapterMemoryAllowWildcard(UnitTester $I) ); $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addRole('Guest'); $acl->addInherit('Guest', 'Member'); @@ -106,7 +106,7 @@ public function aclAdapterMemoryAllowWildcard(UnitTester $I) ); $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $aclRoles = [ 'Admin' => new Role('Admin'), @@ -156,7 +156,7 @@ public function aclAdapterMemoryAllowException(UnitTester $I) ), function () { $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); $acl->allow('Unknown', 'Post', 'update'); @@ -169,7 +169,7 @@ function () { ), function () { $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); $acl->allow('Member', 'Unknown', 'update'); @@ -182,7 +182,7 @@ function () { ), function () { $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); $acl->allow('Member', 'Post', 'Unknown'); @@ -195,7 +195,7 @@ function () { ), function () { $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); $acl->allow('Member', 'Post', ['Unknown']); @@ -217,7 +217,7 @@ public function aclAdapterMemoryAllowFunction(UnitTester $I) $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Guests'); $acl->addRole('Members', 'Guests'); @@ -285,11 +285,11 @@ function () use ($I) { $acl = new Memory(); $acl->setDefaultAction( - Acl::ALLOW + Enum::ALLOW ); $acl->setNoArgumentsDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests'); diff --git a/tests/unit/Acl/Adapter/Memory/ConstructCest.php b/tests/unit/Acl/Adapter/Memory/ConstructCest.php index edc9c81e4d9..c8a00b6d31f 100644 --- a/tests/unit/Acl/Adapter/Memory/ConstructCest.php +++ b/tests/unit/Acl/Adapter/Memory/ConstructCest.php @@ -14,7 +14,7 @@ use function cacheDir; use function file_get_contents; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use Phalcon\Acl\Component; use Phalcon\Acl\Role; @@ -34,8 +34,8 @@ public function aclAdapterMemoryConstructConstants(UnitTester $I) { $I->wantToTest('Acl\Adapter\Memory - __construct() - constants'); - $I->assertEquals(1, Acl::ALLOW); - $I->assertEquals(0, Acl::DENY); + $I->assertEquals(1, Enum::ALLOW); + $I->assertEquals(0, Enum::DENY); } /** @@ -127,7 +127,7 @@ public function testAclSerialize(UnitTester $I) public function testAclNegationOfInheritedRoles(UnitTester $I) { $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Guests'); $acl->addRole('Members', 'Guests'); @@ -164,7 +164,7 @@ public function testIssue12004(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $roleGuest = new Role('guest'); @@ -295,7 +295,7 @@ public function testAclNegationOfMultipleInheritedRoles(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests'); @@ -345,7 +345,7 @@ public function testAclNegationOfMultilayerInheritedRoles(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests1'); diff --git a/tests/unit/Acl/Adapter/Memory/DenyCest.php b/tests/unit/Acl/Adapter/Memory/DenyCest.php index 56d5c366251..3be78705c3f 100644 --- a/tests/unit/Acl/Adapter/Memory/DenyCest.php +++ b/tests/unit/Acl/Adapter/Memory/DenyCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use UnitTester; @@ -31,7 +31,7 @@ public function aclAdapterMemoryDeny(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::ALLOW + Enum::ALLOW ); $acl->addRole('Guests'); diff --git a/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php b/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php index 14a2e64d2e7..a96c51b780d 100644 --- a/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php +++ b/tests/unit/Acl/Adapter/Memory/DropComponentAccessCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use UnitTester; @@ -31,7 +31,7 @@ public function aclAdapterMemoryDropComponentAccess(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests'); diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php index 889d6057c09..ed3bdd9801b 100644 --- a/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php +++ b/tests/unit/Acl/Adapter/Memory/GetActiveAccessCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use UnitTester; @@ -48,7 +48,7 @@ public function aclAdapterMemoryGetActiveAccess(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests'); diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php index 20c90fbc48d..d19797de5e9 100644 --- a/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php +++ b/tests/unit/Acl/Adapter/Memory/GetActiveComponentCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use UnitTester; @@ -48,7 +48,7 @@ public function aclAdapterMemoryGetActiveComponent(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests'); diff --git a/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php b/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php index 6113330273f..0864fbef4ef 100644 --- a/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php +++ b/tests/unit/Acl/Adapter/Memory/GetActiveRoleCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use UnitTester; @@ -48,7 +48,7 @@ public function aclAdapterMemoryGetActiveRole(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Guests'); diff --git a/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php b/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php index da98dedee84..2c44fd19caf 100644 --- a/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php +++ b/tests/unit/Acl/Adapter/Memory/GetSetDefaultActionCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use UnitTester; @@ -31,11 +31,11 @@ public function aclAdapterMemoryGetSetDefaultAction(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::ALLOW + Enum::ALLOW ); $I->assertEquals( - Acl::ALLOW, + Enum::ALLOW, $acl->getDefaultAction() ); } @@ -53,7 +53,7 @@ public function aclAdapterMemoryGetSetDefaultActionDefault(UnitTester $I) $acl = new Memory(); $I->assertEquals( - Acl::DENY, + Enum::DENY, $acl->getDefaultAction() ); } diff --git a/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php b/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php index 1462866125e..f88d699f510 100644 --- a/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php +++ b/tests/unit/Acl/Adapter/Memory/GetSetNoArgumentsDefaultActionCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use UnitTester; @@ -34,11 +34,11 @@ public function aclAdapterMemoryGetSetNoArgumentsDefaultAction(UnitTester $I) $acl = new Memory(); $acl->setNoArgumentsDefaultAction( - Acl::ALLOW + Enum::ALLOW ); $I->assertEquals( - Acl::ALLOW, + Enum::ALLOW, $acl->getNoArgumentsDefaultAction() ); } @@ -59,7 +59,7 @@ public function aclAdapterMemoryGetSetNoArgumentsDefaultActionDefault(UnitTester $acl = new Memory(); $I->assertEquals( - Acl::DENY, + Enum::DENY, $acl->getNoArgumentsDefaultAction() ); } diff --git a/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php b/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php index 86c8c54b56e..b532d04ed38 100644 --- a/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php +++ b/tests/unit/Acl/Adapter/Memory/IsAllowedCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Acl\Adapter\Memory; use Exception; -use Phalcon\Acl; +use Phalcon\Acl\Enum; use Phalcon\Acl\Adapter\Memory; use Phalcon\Acl\Component; use Phalcon\Acl\Exception as AclException; @@ -41,7 +41,7 @@ public function aclAdapterMemoryIsAllowedDefault(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addComponent( @@ -81,7 +81,7 @@ public function aclAdapterMemoryIsAllowedObjects(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $role = new Role('Guests'); @@ -123,7 +123,7 @@ public function aclAdapterMemoryIsAllowedSameClass(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $role = new TestRoleComponentAware(1, 'User', 'Admin'); @@ -171,7 +171,7 @@ public function aclAdapterMemoryIsAllowedFunctionNoParameters(UnitTester $I) $acl = new Memory(); $acl->setDefaultAction( - Acl::DENY + Enum::DENY ); $acl->addRole('Admin'); @@ -211,8 +211,8 @@ public function aclAdapterMemoryIsAllowedFunctionMoreParameters(UnitTester $I) function () use ($I) { $acl = new Memory(); - $acl->setDefaultAction(Acl::ALLOW); - $acl->setNoArgumentsDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::ALLOW); + $acl->setNoArgumentsDefaultAction(Enum::DENY); $acl->addRole('Members'); $acl->addComponent('Post', ['update']); @@ -261,8 +261,8 @@ public function aclAdapterMemoryIsAllowedFunctionNotEnoughParameters(UnitTester function () use ($I) { $acl = new Memory(); - $acl->setDefaultAction(Acl::ALLOW); - $acl->setNoArgumentsDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::ALLOW); + $acl->setNoArgumentsDefaultAction(Enum::DENY); $acl->addRole('Members'); $acl->addComponent('Post', ['update']); @@ -309,7 +309,7 @@ public function aclAdapterMemoryIsAllowedException(UnitTester $I) ), function () { $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); $acl->allow('Member', 'Post', 'update'); @@ -324,7 +324,7 @@ function () { ), function () { $acl = new Memory(); - $acl->setDefaultAction(Acl::DENY); + $acl->setDefaultAction(Enum::DENY); $acl->addRole('Member'); $acl->addComponent('Post', ['update']); $acl->allow('Member', 'Post', 'update'); diff --git a/tests/unit/Container/ConstructCest.php b/tests/unit/Container/ConstructCest.php index 6af09484e55..d4364cbf1ff 100644 --- a/tests/unit/Container/ConstructCest.php +++ b/tests/unit/Container/ConstructCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Container; -use Phalcon\Container; +use Phalcon\Container\Container; use Phalcon\Di; use Psr\Container\ContainerInterface; use UnitTester; diff --git a/tests/unit/Container/GetCest.php b/tests/unit/Container/GetCest.php index 4735f35a018..78ec242bcc8 100644 --- a/tests/unit/Container/GetCest.php +++ b/tests/unit/Container/GetCest.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Unit\Container; -use Phalcon\Container; +use Phalcon\Container\Container; use Phalcon\Di\Service; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Test\Fixtures\Traits\DiTrait; use UnitTester; diff --git a/tests/unit/Container/HasCest.php b/tests/unit/Container/HasCest.php index 013bc0b9581..e6e6ddabf43 100644 --- a/tests/unit/Container/HasCest.php +++ b/tests/unit/Container/HasCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Container; -use Phalcon\Container; +use Phalcon\Container\Container; use Phalcon\Test\Fixtures\Traits\DiTrait; use UnitTester; diff --git a/tests/unit/Crypt/ConstructCest.php b/tests/unit/Crypt/ConstructCest.php index 06bf04e511c..b116454e4d7 100644 --- a/tests/unit/Crypt/ConstructCest.php +++ b/tests/unit/Crypt/ConstructCest.php @@ -12,13 +12,13 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use UnitTester; class ConstructCest { /** - * Tests Phalcon\Crypt :: __construct() + * Tests Phalcon\Crypt\Crypt :: __construct() * * @author Phalcon Team * @since 2018-11-13 diff --git a/tests/unit/Crypt/DecryptBase64Cest.php b/tests/unit/Crypt/DecryptBase64Cest.php index a1b76a4a0fb..2a6fcdf35c4 100644 --- a/tests/unit/Crypt/DecryptBase64Cest.php +++ b/tests/unit/Crypt/DecryptBase64Cest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Crypt\Mismatch; use UnitTester; diff --git a/tests/unit/Crypt/DecryptCest.php b/tests/unit/Crypt/DecryptCest.php index df5ae450fc7..f68487eb97d 100644 --- a/tests/unit/Crypt/DecryptCest.php +++ b/tests/unit/Crypt/DecryptCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Crypt\Mismatch; use UnitTester; diff --git a/tests/unit/Crypt/EncryptBase64Cest.php b/tests/unit/Crypt/EncryptBase64Cest.php index 2f972a598e5..392f60ad649 100644 --- a/tests/unit/Crypt/EncryptBase64Cest.php +++ b/tests/unit/Crypt/EncryptBase64Cest.php @@ -12,13 +12,13 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use UnitTester; class EncryptBase64Cest { /** - * Tests Phalcon\Crypt :: encryptBase64() + * Tests Phalcon\Crypt\Crypt :: encryptBase64() * * @author Phalcon Team * @since 2019-04-16 diff --git a/tests/unit/Crypt/EncryptCest.php b/tests/unit/Crypt/EncryptCest.php index 9ae0eb0220a..c32d8ea0c14 100644 --- a/tests/unit/Crypt/EncryptCest.php +++ b/tests/unit/Crypt/EncryptCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Crypt\Exception; use function substr; use UnitTester; @@ -20,7 +20,7 @@ class EncryptCest { /** - * Tests Phalcon\Crypt :: encrypt() + * Tests Phalcon\Crypt\Crypt :: encrypt() * * @author Phalcon Team * @since 2018-11-13 @@ -82,7 +82,7 @@ public function cryptEncrypt(UnitTester $I) } /** - * Tests Phalcon\Crypt :: encrypt() - unsupported algo + * Tests Phalcon\Crypt\Crypt :: encrypt() - unsupported algo * * @author Phalcon Team * @since 2018-11-13 @@ -104,7 +104,7 @@ function () { } /** - * Tests Phalcon\Crypt :: encrypt() - gcm + * Tests Phalcon\Crypt\Crypt :: encrypt() - gcm * * @author Phalcon Team * @since 2019-05-15 diff --git a/tests/unit/Crypt/GetAuthDataCest.php b/tests/unit/Crypt/GetAuthDataCest.php index e7e5c1388b9..de655472c13 100644 --- a/tests/unit/Crypt/GetAuthDataCest.php +++ b/tests/unit/Crypt/GetAuthDataCest.php @@ -17,7 +17,7 @@ class GetAuthDataCest { /** - * Unit Tests Phalcon\Crypt :: getAuthData() + * Unit Tests Phalcon\Crypt\Crypt :: getAuthData() * * @author Phalcon Team * @since 2019-05-25 diff --git a/tests/unit/Crypt/GetAuthTagCest.php b/tests/unit/Crypt/GetAuthTagCest.php index 733bdb6c616..b1dd74100a6 100644 --- a/tests/unit/Crypt/GetAuthTagCest.php +++ b/tests/unit/Crypt/GetAuthTagCest.php @@ -17,7 +17,7 @@ class GetAuthTagCest { /** - * Unit Tests Phalcon\Crypt :: getAuthTag() + * Unit Tests Phalcon\Crypt\Crypt :: getAuthTag() * * @author Phalcon Team * @since 2019-05-25 diff --git a/tests/unit/Crypt/GetAuthTagLengthCest.php b/tests/unit/Crypt/GetAuthTagLengthCest.php index 4d85bd57c84..da431649620 100644 --- a/tests/unit/Crypt/GetAuthTagLengthCest.php +++ b/tests/unit/Crypt/GetAuthTagLengthCest.php @@ -17,7 +17,7 @@ class GetAuthTagLengthCest { /** - * Unit Tests Phalcon\Crypt :: getAuthTagLength() + * Unit Tests Phalcon\Crypt\Crypt :: getAuthTagLength() * * @author Phalcon Team * @since 2019-05-25 diff --git a/tests/unit/Crypt/GetAvailableCiphersCest.php b/tests/unit/Crypt/GetAvailableCiphersCest.php index cc00c68e653..ae48cf289e9 100644 --- a/tests/unit/Crypt/GetAvailableCiphersCest.php +++ b/tests/unit/Crypt/GetAvailableCiphersCest.php @@ -12,13 +12,13 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use UnitTester; class GetAvailableCiphersCest { /** - * Tests Phalcon\Crypt :: getAvailableCiphers() + * Tests Phalcon\Crypt\Crypt :: getAvailableCiphers() * * @author Phalcon Team * @since 2018-11-13 diff --git a/tests/unit/Crypt/GetAvailableHashAlgosCest.php b/tests/unit/Crypt/GetAvailableHashAlgosCest.php index 4015c730395..e35e64420fa 100644 --- a/tests/unit/Crypt/GetAvailableHashAlgosCest.php +++ b/tests/unit/Crypt/GetAvailableHashAlgosCest.php @@ -12,13 +12,13 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use UnitTester; class GetAvailableHashAlgosCest { /** - * Tests Phalcon\Crypt :: getAvailableHashAlgos() + * Tests Phalcon\Crypt\Crypt :: getAvailableHashAlgos() * * @author Phalcon Team * @since 2018-11-13 diff --git a/tests/unit/Crypt/GetHashAlgoCest.php b/tests/unit/Crypt/GetHashAlgoCest.php index 95c571cf570..8a914342072 100644 --- a/tests/unit/Crypt/GetHashAlgoCest.php +++ b/tests/unit/Crypt/GetHashAlgoCest.php @@ -17,7 +17,7 @@ class GetHashAlgoCest { /** - * Tests Phalcon\Crypt :: getHashAlgo() + * Tests Phalcon\Crypt\Crypt :: getHashAlgo() * * @author Phalcon Team * @since 2019-04-16 diff --git a/tests/unit/Crypt/GetKeyCest.php b/tests/unit/Crypt/GetKeyCest.php index 40285686846..9b92c33c592 100644 --- a/tests/unit/Crypt/GetKeyCest.php +++ b/tests/unit/Crypt/GetKeyCest.php @@ -17,7 +17,7 @@ class GetKeyCest { /** - * Tests Phalcon\Crypt :: getKey() + * Tests Phalcon\Crypt\Crypt :: getKey() * * @author Phalcon Team * @since 2019-04-16 diff --git a/tests/unit/Crypt/GetSetCipherCest.php b/tests/unit/Crypt/GetSetCipherCest.php index 7f55748b0e5..6775b5fdfe8 100644 --- a/tests/unit/Crypt/GetSetCipherCest.php +++ b/tests/unit/Crypt/GetSetCipherCest.php @@ -12,14 +12,14 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Crypt\Exception; use UnitTester; class GetSetCipherCest { /** - * Tests Phalcon\Crypt :: getCipher() / setCipher() + * Tests Phalcon\Crypt\Crypt :: getCipher() / setCipher() * * @author Phalcon Team * @since 2018-11-13 diff --git a/tests/unit/Crypt/SetAuthDataCest.php b/tests/unit/Crypt/SetAuthDataCest.php index 6388f4eec8f..5821180c529 100644 --- a/tests/unit/Crypt/SetAuthDataCest.php +++ b/tests/unit/Crypt/SetAuthDataCest.php @@ -17,7 +17,7 @@ class SetAuthDataCest { /** - * Unit Tests Phalcon\Crypt :: setAuthData() + * Unit Tests Phalcon\Crypt\Crypt :: setAuthData() * * @author Phalcon Team * @since 2019-05-25 diff --git a/tests/unit/Crypt/SetAuthTagCest.php b/tests/unit/Crypt/SetAuthTagCest.php index 528ae0c0de9..544417aa804 100644 --- a/tests/unit/Crypt/SetAuthTagCest.php +++ b/tests/unit/Crypt/SetAuthTagCest.php @@ -17,7 +17,7 @@ class SetAuthTagCest { /** - * Unit Tests Phalcon\Crypt :: setAuthTag() + * Unit Tests Phalcon\Crypt\Crypt :: setAuthTag() * * @author Phalcon Team * @since 2019-05-25 diff --git a/tests/unit/Crypt/SetAuthTagLengthCest.php b/tests/unit/Crypt/SetAuthTagLengthCest.php index 9bfda01e210..9ec39c42b0a 100644 --- a/tests/unit/Crypt/SetAuthTagLengthCest.php +++ b/tests/unit/Crypt/SetAuthTagLengthCest.php @@ -17,7 +17,7 @@ class SetAuthTagLengthCest { /** - * Unit Tests Phalcon\Crypt :: setAuthTagLength() + * Unit Tests Phalcon\Crypt\Crypt :: setAuthTagLength() * * @author Phalcon Team * @since 2019-05-25 diff --git a/tests/unit/Crypt/SetHashAlgoCest.php b/tests/unit/Crypt/SetHashAlgoCest.php index 6bd4a6f4403..79725f5dcf9 100644 --- a/tests/unit/Crypt/SetHashAlgoCest.php +++ b/tests/unit/Crypt/SetHashAlgoCest.php @@ -17,7 +17,7 @@ class SetHashAlgoCest { /** - * Tests Phalcon\Crypt :: setHashAlgo() + * Tests Phalcon\Crypt\Crypt :: setHashAlgo() * * @author Phalcon Team * @since 2019-04-16 diff --git a/tests/unit/Crypt/SetKeyCest.php b/tests/unit/Crypt/SetKeyCest.php index bd905029e7f..25bc70b529b 100644 --- a/tests/unit/Crypt/SetKeyCest.php +++ b/tests/unit/Crypt/SetKeyCest.php @@ -17,7 +17,7 @@ class SetKeyCest { /** - * Tests Phalcon\Crypt :: setKey() + * Tests Phalcon\Crypt\Crypt :: setKey() * * @author Phalcon Team * @since 2019-04-16 diff --git a/tests/unit/Crypt/SetPaddingCest.php b/tests/unit/Crypt/SetPaddingCest.php index 3cd1694a0d4..37027cd4eb0 100644 --- a/tests/unit/Crypt/SetPaddingCest.php +++ b/tests/unit/Crypt/SetPaddingCest.php @@ -12,13 +12,13 @@ namespace Phalcon\Test\Unit\Crypt; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use UnitTester; class SetPaddingCest { /** - * Tests Phalcon\Crypt :: setPadding() + * Tests Phalcon\Crypt\Crypt :: setPadding() * * @author Phalcon Team * @since 2014-10-17 diff --git a/tests/unit/Crypt/UseSigningCest.php b/tests/unit/Crypt/UseSigningCest.php index 597ca93998e..127a15ba1ca 100644 --- a/tests/unit/Crypt/UseSigningCest.php +++ b/tests/unit/Crypt/UseSigningCest.php @@ -17,7 +17,7 @@ class UseSigningCest { /** - * Tests Phalcon\Crypt :: useSigning() + * Tests Phalcon\Crypt\Crypt :: useSigning() * * @author Phalcon Team * @since 2019-04-16 diff --git a/tests/unit/Debug/GetCssSourcesCest.php b/tests/unit/Debug/GetCssSourcesCest.php index cd4590abb45..28de280ed14 100644 --- a/tests/unit/Debug/GetCssSourcesCest.php +++ b/tests/unit/Debug/GetCssSourcesCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Debug; -use Phalcon\Debug; +use Phalcon\Debug\Debug; use function sprintf; use UnitTester; diff --git a/tests/unit/Debug/GetJsSourcesCest.php b/tests/unit/Debug/GetJsSourcesCest.php index 7533b9c3d81..891683955e2 100644 --- a/tests/unit/Debug/GetJsSourcesCest.php +++ b/tests/unit/Debug/GetJsSourcesCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Debug; -use Phalcon\Debug; +use Phalcon\Debug\Debug; use function sprintf; use UnitTester; diff --git a/tests/unit/Debug/GetVersionCest.php b/tests/unit/Debug/GetVersionCest.php index cd10db7da54..d71cc9b60a3 100644 --- a/tests/unit/Debug/GetVersionCest.php +++ b/tests/unit/Debug/GetVersionCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Debug; -use Phalcon\Debug; +use Phalcon\Debug\Debug; use Phalcon\Test\Fixtures\Traits\DiTrait; use Phalcon\Version; use UnitTester; diff --git a/tests/unit/Debug/SetUriCest.php b/tests/unit/Debug/SetUriCest.php index f7c39ac430d..cb286388349 100644 --- a/tests/unit/Debug/SetUriCest.php +++ b/tests/unit/Debug/SetUriCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Debug; -use Phalcon\Debug; +use Phalcon\Debug\Debug; use UnitTester; class SetUriCest diff --git a/tests/unit/Di/AttemptCest.php b/tests/unit/Di/AttemptCest.php index 02a6273ce22..4b70762ef55 100644 --- a/tests/unit/Di/AttemptCest.php +++ b/tests/unit/Di/AttemptCest.php @@ -14,7 +14,7 @@ use Phalcon\Di; use Phalcon\Di\Service; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class AttemptCest diff --git a/tests/unit/Di/FactoryDefault/Cli/ConstructCest.php b/tests/unit/Di/FactoryDefault/Cli/ConstructCest.php index e0b3058c5ef..1000668bdd3 100644 --- a/tests/unit/Di/FactoryDefault/Cli/ConstructCest.php +++ b/tests/unit/Di/FactoryDefault/Cli/ConstructCest.php @@ -16,13 +16,13 @@ use Phalcon\Cli\Dispatcher; use Phalcon\Cli\Router; use Phalcon\Di\FactoryDefault\Cli; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Events\Manager; use Phalcon\Filter; use Phalcon\Mvc\Model\Manager as ModelManager; use Phalcon\Mvc\Model\MetaData\Memory as MemoryMedaData; use Phalcon\Mvc\Model\Transaction\Manager as ManagerTransaction; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class ConstructCest diff --git a/tests/unit/Di/FactoryDefault/ConstructCest.php b/tests/unit/Di/FactoryDefault/ConstructCest.php index 0591ff4fb76..54a6c2c8596 100644 --- a/tests/unit/Di/FactoryDefault/ConstructCest.php +++ b/tests/unit/Di/FactoryDefault/ConstructCest.php @@ -15,9 +15,9 @@ use Codeception\Example; use Phalcon\Annotations\Adapter\Memory as MemoryAnnotations; use Phalcon\Assets\Manager as ManagerAssets; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Di\FactoryDefault; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Events\Manager as ManagerEvents; use Phalcon\Filter\Filter; use Phalcon\Flash\Direct; @@ -30,7 +30,7 @@ use Phalcon\Mvc\Model\MetaData\Memory; use Phalcon\Mvc\Model\Transaction\Manager; use Phalcon\Mvc\Router; -use Phalcon\Security; +use Phalcon\Security\Security; use Phalcon\Tag; use Phalcon\Url; use UnitTester; diff --git a/tests/unit/Di/GetCest.php b/tests/unit/Di/GetCest.php index 694e6e6bd21..fed974d99e0 100644 --- a/tests/unit/Di/GetCest.php +++ b/tests/unit/Di/GetCest.php @@ -15,7 +15,7 @@ use Phalcon\Di; use Phalcon\Di\Exception; use Phalcon\Di\Service; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class GetCest diff --git a/tests/unit/Di/GetRawCest.php b/tests/unit/Di/GetRawCest.php index c3d007c2ad8..4aecc624aed 100644 --- a/tests/unit/Di/GetRawCest.php +++ b/tests/unit/Di/GetRawCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class GetRawCest diff --git a/tests/unit/Di/GetServiceCest.php b/tests/unit/Di/GetServiceCest.php index e563a1b8924..64813ad728a 100644 --- a/tests/unit/Di/GetServiceCest.php +++ b/tests/unit/Di/GetServiceCest.php @@ -15,7 +15,7 @@ use Phalcon\Di; use Phalcon\Di\Exception; use Phalcon\Di\Service; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class GetServiceCest diff --git a/tests/unit/Di/GetServicesCest.php b/tests/unit/Di/GetServicesCest.php index fecd4c3f001..ed05654a38b 100644 --- a/tests/unit/Di/GetServicesCest.php +++ b/tests/unit/Di/GetServicesCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class GetServicesCest diff --git a/tests/unit/Di/GetSetDefaultCest.php b/tests/unit/Di/GetSetDefaultCest.php index c9efabbe523..be8787e41ff 100644 --- a/tests/unit/Di/GetSetDefaultCest.php +++ b/tests/unit/Di/GetSetDefaultCest.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Unit\Di; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class GetSetDefaultCest diff --git a/tests/unit/Di/GetSharedCest.php b/tests/unit/Di/GetSharedCest.php index 71fb0b055c4..43ac29b866f 100644 --- a/tests/unit/Di/GetSharedCest.php +++ b/tests/unit/Di/GetSharedCest.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Unit\Di; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class GetSharedCest diff --git a/tests/unit/Di/HasCest.php b/tests/unit/Di/HasCest.php index d7dd7283891..2f0ed4874ca 100644 --- a/tests/unit/Di/HasCest.php +++ b/tests/unit/Di/HasCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class HasCest diff --git a/tests/unit/Di/OffsetExistsCest.php b/tests/unit/Di/OffsetExistsCest.php index c4c006fe720..077e5d0be5a 100644 --- a/tests/unit/Di/OffsetExistsCest.php +++ b/tests/unit/Di/OffsetExistsCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class OffsetExistsCest diff --git a/tests/unit/Di/OffsetGetCest.php b/tests/unit/Di/OffsetGetCest.php index e59975f6630..0d5b3c625d0 100644 --- a/tests/unit/Di/OffsetGetCest.php +++ b/tests/unit/Di/OffsetGetCest.php @@ -14,7 +14,7 @@ use Phalcon\Di; use Phalcon\Di\Exception; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class OffsetGetCest diff --git a/tests/unit/Di/OffsetSetCest.php b/tests/unit/Di/OffsetSetCest.php index f2f179d0d91..57d377333d3 100644 --- a/tests/unit/Di/OffsetSetCest.php +++ b/tests/unit/Di/OffsetSetCest.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Unit\Di; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class OffsetSetCest diff --git a/tests/unit/Di/OffsetUnsetCest.php b/tests/unit/Di/OffsetUnsetCest.php index fc8332781d6..8e0b02ff004 100644 --- a/tests/unit/Di/OffsetUnsetCest.php +++ b/tests/unit/Di/OffsetUnsetCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class OffsetUnsetCest diff --git a/tests/unit/Di/RemoveCest.php b/tests/unit/Di/RemoveCest.php index 626418018ee..5346eec196d 100644 --- a/tests/unit/Di/RemoveCest.php +++ b/tests/unit/Di/RemoveCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class RemoveCest diff --git a/tests/unit/Di/ServiceCest.php b/tests/unit/Di/ServiceCest.php index 1b20b1b0f01..0724b1f254b 100644 --- a/tests/unit/Di/ServiceCest.php +++ b/tests/unit/Di/ServiceCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class ServiceCest diff --git a/tests/unit/Di/SetCest.php b/tests/unit/Di/SetCest.php index b2fd9017849..a333f3871d3 100644 --- a/tests/unit/Di/SetCest.php +++ b/tests/unit/Di/SetCest.php @@ -12,9 +12,9 @@ namespace Phalcon\Test\Unit\Di; -use Phalcon\Crypt; +use Phalcon\Crypt\Crypt; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class SetCest diff --git a/tests/unit/Di/SetSharedCest.php b/tests/unit/Di/SetSharedCest.php index 5520447d077..8ca59fa65e7 100644 --- a/tests/unit/Di/SetSharedCest.php +++ b/tests/unit/Di/SetSharedCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Di; use Phalcon\Di; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class SetSharedCest diff --git a/tests/unit/Di/UnderscoreCallCest.php b/tests/unit/Di/UnderscoreCallCest.php index 66e00cf2670..a77d997d47d 100644 --- a/tests/unit/Di/UnderscoreCallCest.php +++ b/tests/unit/Di/UnderscoreCallCest.php @@ -14,7 +14,7 @@ use Phalcon\Di; use Phalcon\Di\Exception; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class UnderscoreCallCest diff --git a/tests/unit/Escaper/DetectEncodingCest.php b/tests/unit/Escaper/DetectEncodingCest.php index 24311b123b0..97452c355a4 100644 --- a/tests/unit/Escaper/DetectEncodingCest.php +++ b/tests/unit/Escaper/DetectEncodingCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Escaper; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class DetectEncodingCest diff --git a/tests/unit/Escaper/EscapeCssCest.php b/tests/unit/Escaper/EscapeCssCest.php index 7b3c809beb4..a6800c9901f 100644 --- a/tests/unit/Escaper/EscapeCssCest.php +++ b/tests/unit/Escaper/EscapeCssCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class EscapeCssCest diff --git a/tests/unit/Escaper/EscapeHtmlAttrCest.php b/tests/unit/Escaper/EscapeHtmlAttrCest.php index ffacea0906e..6227f711290 100644 --- a/tests/unit/Escaper/EscapeHtmlAttrCest.php +++ b/tests/unit/Escaper/EscapeHtmlAttrCest.php @@ -17,7 +17,7 @@ use const ENT_HTML5; use const ENT_XHTML; use const ENT_XML1; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class EscapeHtmlAttrCest diff --git a/tests/unit/Escaper/EscapeHtmlCest.php b/tests/unit/Escaper/EscapeHtmlCest.php index 44f2b5194ca..a7d05da192e 100644 --- a/tests/unit/Escaper/EscapeHtmlCest.php +++ b/tests/unit/Escaper/EscapeHtmlCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class EscapeHtmlCest diff --git a/tests/unit/Escaper/EscapeJsCest.php b/tests/unit/Escaper/EscapeJsCest.php index 7368051bf61..e14c29308cf 100644 --- a/tests/unit/Escaper/EscapeJsCest.php +++ b/tests/unit/Escaper/EscapeJsCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class EscapeJsCest diff --git a/tests/unit/Escaper/EscapeUrlCest.php b/tests/unit/Escaper/EscapeUrlCest.php index b8732b2a84b..a6f731543c2 100644 --- a/tests/unit/Escaper/EscapeUrlCest.php +++ b/tests/unit/Escaper/EscapeUrlCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class EscapeUrlCest diff --git a/tests/unit/Escaper/GetSetEncodingCest.php b/tests/unit/Escaper/GetSetEncodingCest.php index d1974d66cdf..f72c2bdfc17 100644 --- a/tests/unit/Escaper/GetSetEncodingCest.php +++ b/tests/unit/Escaper/GetSetEncodingCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class GetSetEncodingCest diff --git a/tests/unit/Escaper/NormalizeEncodingCest.php b/tests/unit/Escaper/NormalizeEncodingCest.php index 1d49ead62e0..69e23992ca2 100644 --- a/tests/unit/Escaper/NormalizeEncodingCest.php +++ b/tests/unit/Escaper/NormalizeEncodingCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class NormalizeEncodingCest diff --git a/tests/unit/Escaper/SetDoubleEncodeCest.php b/tests/unit/Escaper/SetDoubleEncodeCest.php index 160e4c9f598..91cfdfd2496 100644 --- a/tests/unit/Escaper/SetDoubleEncodeCest.php +++ b/tests/unit/Escaper/SetDoubleEncodeCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class SetDoubleEncodeCest diff --git a/tests/unit/Escaper/SetHtmlQuoteTypeCest.php b/tests/unit/Escaper/SetHtmlQuoteTypeCest.php index e4094c5c6b2..3962817f1b7 100644 --- a/tests/unit/Escaper/SetHtmlQuoteTypeCest.php +++ b/tests/unit/Escaper/SetHtmlQuoteTypeCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Escaper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use UnitTester; class SetHtmlQuoteTypeCest diff --git a/tests/unit/Html/Helper/AnchorCest.php b/tests/unit/Html/Helper/AnchorCest.php index e7f5ca4cab5..fd0eabe0d5b 100644 --- a/tests/unit/Html/Helper/AnchorCest.php +++ b/tests/unit/Html/Helper/AnchorCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Anchor; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/AnchorRawCest.php b/tests/unit/Html/Helper/AnchorRawCest.php index 5d6122ec4d4..7d78a4e4694 100644 --- a/tests/unit/Html/Helper/AnchorRawCest.php +++ b/tests/unit/Html/Helper/AnchorRawCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\AnchorRaw; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/BodyCest.php b/tests/unit/Html/Helper/BodyCest.php index e9ab0202dd3..5bda4206db4 100644 --- a/tests/unit/Html/Helper/BodyCest.php +++ b/tests/unit/Html/Helper/BodyCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Body; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/ButtonCest.php b/tests/unit/Html/Helper/ButtonCest.php index be65b2600e1..63c3ed2e624 100644 --- a/tests/unit/Html/Helper/ButtonCest.php +++ b/tests/unit/Html/Helper/ButtonCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper\Button; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Button; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/CloseCest.php b/tests/unit/Html/Helper/CloseCest.php index 7daf3a6e279..e0e496499a8 100644 --- a/tests/unit/Html/Helper/CloseCest.php +++ b/tests/unit/Html/Helper/CloseCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Html\Helper; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Close; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/ElementCest.php b/tests/unit/Html/Helper/ElementCest.php index 08bd02110c9..fbbb3806e6b 100644 --- a/tests/unit/Html/Helper/ElementCest.php +++ b/tests/unit/Html/Helper/ElementCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper\Element; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Element; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/ElementRawCest.php b/tests/unit/Html/Helper/ElementRawCest.php index 6c1a60f8d76..260b0d2f5c2 100644 --- a/tests/unit/Html/Helper/ElementRawCest.php +++ b/tests/unit/Html/Helper/ElementRawCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper\Element; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\ElementRaw; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/FormCest.php b/tests/unit/Html/Helper/FormCest.php index 995588331b1..e3931a2dacf 100644 --- a/tests/unit/Html/Helper/FormCest.php +++ b/tests/unit/Html/Helper/FormCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Form; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/ImgCest.php b/tests/unit/Html/Helper/ImgCest.php index c03141ee99e..c87e230683b 100644 --- a/tests/unit/Html/Helper/ImgCest.php +++ b/tests/unit/Html/Helper/ImgCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Img; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/LabelCest.php b/tests/unit/Html/Helper/LabelCest.php index 82f2354e347..9e9fcde234e 100644 --- a/tests/unit/Html/Helper/LabelCest.php +++ b/tests/unit/Html/Helper/LabelCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\Label; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/Helper/TextAreaCest.php b/tests/unit/Html/Helper/TextAreaCest.php index 0435d086943..b328ca8a8bd 100644 --- a/tests/unit/Html/Helper/TextAreaCest.php +++ b/tests/unit/Html/Helper/TextAreaCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\Helper\TextArea; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Html\Exception; use Phalcon\Html\Helper\TextArea; use Phalcon\Html\TagFactory; diff --git a/tests/unit/Html/TagFactory/NewInstanceCest.php b/tests/unit/Html/TagFactory/NewInstanceCest.php index 928436c6044..87df3e3e9c4 100644 --- a/tests/unit/Html/TagFactory/NewInstanceCest.php +++ b/tests/unit/Html/TagFactory/NewInstanceCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Html\TagFactory; use Codeception\Example; -use Phalcon\Escaper; +use Phalcon\Escaper\Escaper; use Phalcon\Factory\Exception; use Phalcon\Html\Helper\Anchor; use Phalcon\Html\Helper\AnchorRaw; diff --git a/tests/unit/Security/CheckHashCest.php b/tests/unit/Security/CheckHashCest.php index 1ac6ffd40a6..017b9068538 100644 --- a/tests/unit/Security/CheckHashCest.php +++ b/tests/unit/Security/CheckHashCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class CheckHashCest diff --git a/tests/unit/Security/CheckTokenCest.php b/tests/unit/Security/CheckTokenCest.php index 4871ef992f4..733d53fae21 100644 --- a/tests/unit/Security/CheckTokenCest.php +++ b/tests/unit/Security/CheckTokenCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use Phalcon\Test\Fixtures\Traits\DiTrait; use function session_destroy; use function session_start; diff --git a/tests/unit/Security/ComputeHmacCest.php b/tests/unit/Security/ComputeHmacCest.php index e93d5c9ee44..a0e792ab98b 100644 --- a/tests/unit/Security/ComputeHmacCest.php +++ b/tests/unit/Security/ComputeHmacCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Security; use Codeception\Example; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class ComputeHmacCest diff --git a/tests/unit/Security/ConstructCest.php b/tests/unit/Security/ConstructCest.php index 81503846ae7..bbcb3c7b75d 100644 --- a/tests/unit/Security/ConstructCest.php +++ b/tests/unit/Security/ConstructCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class ConstructCest diff --git a/tests/unit/Security/GetRandomCest.php b/tests/unit/Security/GetRandomCest.php index 05af63093fe..01761420c0b 100644 --- a/tests/unit/Security/GetRandomCest.php +++ b/tests/unit/Security/GetRandomCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use Phalcon\Security\Random; use UnitTester; diff --git a/tests/unit/Security/GetRequestTokenCest.php b/tests/unit/Security/GetRequestTokenCest.php index 227a85ab777..a767220711d 100644 --- a/tests/unit/Security/GetRequestTokenCest.php +++ b/tests/unit/Security/GetRequestTokenCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use Phalcon\Test\Fixtures\Traits\DiTrait; use function session_destroy; use function session_start; diff --git a/tests/unit/Security/GetSaltBytesCest.php b/tests/unit/Security/GetSaltBytesCest.php index 8b488fa4cfd..d8d6cde6d5b 100644 --- a/tests/unit/Security/GetSaltBytesCest.php +++ b/tests/unit/Security/GetSaltBytesCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class GetSaltBytesCest diff --git a/tests/unit/Security/GetSetDefaultHashCest.php b/tests/unit/Security/GetSetDefaultHashCest.php index 1c2f956625c..ece15c25b3a 100644 --- a/tests/unit/Security/GetSetDefaultHashCest.php +++ b/tests/unit/Security/GetSetDefaultHashCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class GetSetDefaultHashCest diff --git a/tests/unit/Security/GetSetRandomBytesCest.php b/tests/unit/Security/GetSetRandomBytesCest.php index 149ad3ec6b8..ca4f1c95cbf 100644 --- a/tests/unit/Security/GetSetRandomBytesCest.php +++ b/tests/unit/Security/GetSetRandomBytesCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class GetSetRandomBytesCest diff --git a/tests/unit/Security/GetSetWorkFactorCest.php b/tests/unit/Security/GetSetWorkFactorCest.php index 5370b4f8585..f7abf36d772 100644 --- a/tests/unit/Security/GetSetWorkFactorCest.php +++ b/tests/unit/Security/GetSetWorkFactorCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class GetSetWorkFactorCest diff --git a/tests/unit/Security/GetTokenAndKeyCest.php b/tests/unit/Security/GetTokenAndKeyCest.php index e9918d60c2c..c9b5cff5e26 100644 --- a/tests/unit/Security/GetTokenAndKeyCest.php +++ b/tests/unit/Security/GetTokenAndKeyCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use Phalcon\Test\Fixtures\Traits\DiTrait; use function session_destroy; use function session_start; diff --git a/tests/unit/Security/IsLegacyHashCest.php b/tests/unit/Security/IsLegacyHashCest.php index b82a9e06769..f2986155cb3 100644 --- a/tests/unit/Security/IsLegacyHashCest.php +++ b/tests/unit/Security/IsLegacyHashCest.php @@ -12,7 +12,7 @@ namespace Phalcon\Test\Unit\Security; -use Phalcon\Security; +use Phalcon\Security\Security; use UnitTester; class IsLegacyHashCest