[#14364] - Moved Filter to the root namespace (makes sense)

phalcon · Sep 8, 2019 · ad2d916 · ad2d916
1 parent a908418
commit ad2d916
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git 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 → phalcon/Filter.zep b/phalcon/Filter/Filter.zep → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <team@phalcon.io>
      * @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 <team@phalcon.io>
      * @since        2019-01-19

diff --git 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 <team@phalcon.io>
      * @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 <team@phalcon.io>
      * @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 <team@phalcon.io>
      * @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 <team@phalcon.io>
      * @since  2018-11-13

diff --git 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;