From ad2d916b926ecc3b72c4b0ec9f3221934e537409 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 8 Sep 2019 10:44:22 -0400 Subject: [PATCH] [#14364] - Moved Filter to the root namespace (makes sense) --- phalcon/Di/Injectable.zep | 2 +- phalcon/{Filter => }/Filter.zep | 2 +- phalcon/Filter/FilterFactory.zep | 2 +- tests/cli/Di/FactoryDefault/Cli/ConstructCest.php | 2 +- tests/unit/Di/FactoryDefault/ConstructCest.php | 2 +- tests/unit/Filter/Filter/ConstructCest.php | 2 +- tests/unit/Filter/Filter/CustomCest.php | 6 +++--- tests/unit/Filter/Filter/GetSetHasCest.php | 10 +++++----- tests/unit/Filter/FilterFactory/NewInstanceCest.php | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename phalcon/{Filter => }/Filter.zep (99%) diff --git a/phalcon/Di/Injectable.zep b/phalcon/Di/Injectable.zep index cc45ae35bc9..2e58a67ae46 100644 --- a/phalcon/Di/Injectable.zep +++ b/phalcon/Di/Injectable.zep @@ -28,7 +28,7 @@ use Phalcon\Session\BagInterface; * @property \Phalcon\Http\Request|\Phalcon\Http\RequestInterface $request * @property \Phalcon\Http\Response|\Phalcon\Http\ResponseInterface $response * @property \Phalcon\Http\Response\Cookies|\Phalcon\Http\Response\CookiesInterface $cookies - * @property \Phalcon\Filter\FilterLocator $filter + * @property \Phalcon\Filter $filter * @property \Phalcon\Flash\Direct $flash * @property \Phalcon\Flash\Session $flashSession * @property \Phalcon\Session\ManagerInterface $session diff --git a/phalcon/Filter/Filter.zep b/phalcon/Filter.zep similarity index 99% rename from phalcon/Filter/Filter.zep rename to phalcon/Filter.zep index ccdc2653aed..6fc81b14735 100644 --- a/phalcon/Filter/Filter.zep +++ b/phalcon/Filter.zep @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Phalcon\Filter; +namespace Phalcon; use Closure; use Phalcon\Filter\Exception; diff --git a/phalcon/Filter/FilterFactory.zep b/phalcon/Filter/FilterFactory.zep index ba092c636a4..fc0f7d069ef 100644 --- a/phalcon/Filter/FilterFactory.zep +++ b/phalcon/Filter/FilterFactory.zep @@ -10,7 +10,7 @@ namespace Phalcon\Filter; -use Phalcon\Filter\Filter; +use Phalcon\Filter; class FilterFactory { diff --git a/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php b/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php index 8bae17a3313..449b6538cad 100644 --- a/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php +++ b/tests/cli/Di/FactoryDefault/Cli/ConstructCest.php @@ -18,7 +18,7 @@ use Phalcon\Cli\Router; use Phalcon\Di\FactoryDefault\Cli; use Phalcon\Escaper; -use Phalcon\Filter\Filter; +use Phalcon\Filter; use Phalcon\Mvc\Model\MetaData\Memory; use Phalcon\Mvc\Model\Transaction\Manager; use Phalcon\Security; diff --git a/tests/unit/Di/FactoryDefault/ConstructCest.php b/tests/unit/Di/FactoryDefault/ConstructCest.php index 80a81d3cddb..c2ec6a46ef5 100644 --- a/tests/unit/Di/FactoryDefault/ConstructCest.php +++ b/tests/unit/Di/FactoryDefault/ConstructCest.php @@ -19,7 +19,7 @@ use Phalcon\Di\FactoryDefault; use Phalcon\Escaper; use Phalcon\Events\Manager as ManagerEvents; -use Phalcon\Filter\Filter; +use Phalcon\Filter; use Phalcon\Flash\Direct; use Phalcon\Flash\Session; use Phalcon\Http\Request; diff --git a/tests/unit/Filter/Filter/ConstructCest.php b/tests/unit/Filter/Filter/ConstructCest.php index cd396aa81e1..35a4f8a0ccb 100644 --- a/tests/unit/Filter/Filter/ConstructCest.php +++ b/tests/unit/Filter/Filter/ConstructCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Filter\Locator; use Phalcon\Filter\Exception; -use Phalcon\Filter\Filter; +use Phalcon\Filter; use UnitTester; class ConstructCest diff --git a/tests/unit/Filter/Filter/CustomCest.php b/tests/unit/Filter/Filter/CustomCest.php index 3c05c3503d0..974e278578c 100644 --- a/tests/unit/Filter/Filter/CustomCest.php +++ b/tests/unit/Filter/Filter/CustomCest.php @@ -12,14 +12,14 @@ namespace Phalcon\Test\Unit\Filter\Filter; -use Phalcon\Filter\Filter; +use Phalcon\Filter; use Phalcon\Test\Fixtures\Filter\Sanitize\IPv4; use UnitTester; class CustomCest { /** - * Tests Phalcon\Filter\Filter :: custom has() + * Tests Phalcon\Filter :: custom has() * * @author Phalcon Team * @since 2019-01-19 @@ -42,7 +42,7 @@ public function filterFilterCustomHas(UnitTester $I) } /** - * Tests Phalcon\Filter\Filter :: custom sanitizer + * Tests Phalcon\Filter :: custom sanitizer * * @author Phalcon Team * @since 2019-01-19 diff --git a/tests/unit/Filter/Filter/GetSetHasCest.php b/tests/unit/Filter/Filter/GetSetHasCest.php index 025de2f0524..120e7e1ce20 100644 --- a/tests/unit/Filter/Filter/GetSetHasCest.php +++ b/tests/unit/Filter/Filter/GetSetHasCest.php @@ -12,14 +12,14 @@ namespace Phalcon\Test\Unit\Filter; -use Phalcon\Filter\Filter; +use Phalcon\Filter; use Phalcon\Test\Fixtures\Service\HelloService; use UnitTester; class GetSetHasCest { /** - * Tests Phalcon\Filter\Filter :: get()/set()/has() - has() + * Tests Phalcon\Filter :: get()/set()/has() - has() * * @author Phalcon Team * @since 2019-01-19 @@ -40,7 +40,7 @@ public function filterFilterGetSetHasHas(UnitTester $I) } /** - * Tests Phalcon\Filter\Filter :: get()/set()/has() - get() + * Tests Phalcon\Filter :: get()/set()/has() - get() * * @author Phalcon Team * @since 2018-11-13 @@ -64,7 +64,7 @@ public function filterFilterLocatorGetSetHasGet(UnitTester $I) } /** - * Tests Phalcon\Filter\Filter :: get()/set()/has() - get() same + * Tests Phalcon\Filter :: get()/set()/has() - get() same * * @author Phalcon Team * @since 2018-11-13 @@ -93,7 +93,7 @@ public function filterFilterGetSetHasGetSame(UnitTester $I) } /** - * Tests Phalcon\Filter\Filter :: get()/set()/has() - set() + * Tests Phalcon\Filter :: get()/set()/has() - set() * * @author Phalcon Team * @since 2018-11-13 diff --git a/tests/unit/Filter/FilterFactory/NewInstanceCest.php b/tests/unit/Filter/FilterFactory/NewInstanceCest.php index a399da10645..55af8f1690a 100644 --- a/tests/unit/Filter/FilterFactory/NewInstanceCest.php +++ b/tests/unit/Filter/FilterFactory/NewInstanceCest.php @@ -13,7 +13,7 @@ namespace Phalcon\Test\Unit\Filter\FilterFactory; use Codeception\Example; -use Phalcon\Filter\Filter; +use Phalcon\Filter; use Phalcon\Filter\FilterFactory; use Phalcon\Filter\FilterInterface; use Phalcon\Filter\Sanitize\AbsInt;