renamed phalcon\mvc\url to phalcon\url (#13831)

* remamed phalcon\mvc\url to phalcon\url

* fixed phalcon\url in phalcon\di\factorydefault

CHANGELOG-4.0.md

@@ -28,14 +28,17 @@
 - Renamed `Phalcon\Acl\AdapterInterface::getSubjects` to `Phalcon\Acl\AdapterInterface::getComponents` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
 - Renamed `Phalcon\Acl\Adapter::getActiveOperation` to `Phalcon\Acl\AdapterInterface::getActiveRole` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
 - Renamed `Phalcon\Acl\Adapter::getActiveSubject` to `Phalcon\Acl\AdapterInterface::getActiveComponent` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::addOperation` to `Phalcon\Acl\Adapter\Memory::addRole` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::isOperation` to `Phalcon\Acl\Adapter\Memory::isRole` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::isSubject` to `Phalcon\Acl\Adapter\Memory::isComponent` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::addSubject` to `Phalcon\Acl\Adapter\Memory::addComponent` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::addSubjectAccess` to `Phalcon\Acl\Adapter\Memory::addComponentAccess` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::dropSubjectAccess` to `Phalcon\Acl\Adapter\Memory::dropComponentAccess` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::getOperationss` to `Phalcon\Acl\Adapter\Memory::getRoles` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
-- Renamed `Phalcon\Acl\Adapter\Memory::getSubjects` to `Phalcon\Acl\Adapter\Memory::getComponents` [#13808](https://github.com/phalcon/cphalcon/issues/13808)
+- Renamed `Phalcon\Acl\Adapter\Memory::addOperation` to `Phalcon\Acl\Adapter\Memory::addRole` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Acl\Adapter\Memory::isOperation` to `Phalcon\Acl\Adapter\Memory::isRole` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Acl\Adapter\Memory::isSubject` to `Phalcon\Acl\Adapter\Memory::isComponent` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Acl\Adapter\Memory::addSubject` to `Phalcon\Acl\Adapter\Memory::addComponent` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Acl\Adapter\Memory::addSubjectAccess` to `Phalcon\Acl\Adapter\Memory::addComponentAccess` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Acl\Adapter\Memory::dropSubjectAccess` to `Phalcon\Acl\Adapter\Memory::dropComponentAccess` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Acl\Adapter\Memory::getOperationss` to `Phalcon\Acl\Adapter\Memory::getRoles` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Acl\Adapter\Memory::getSubjects` to `Phalcon\Acl\Adapter\Memory::getComponents` [#13808](https://github.com/phalcon/cphalcon/issues/13808) 
+- Renamed `Phalcon\Mvc\Url` to `Phalcon\Url` [#13742](https://github.com/phalcon/cphalcon/issues/13742)
+- Renamed `Phalcon\Mvc\UrlInterface` to `Phalcon\UrlInterface` [#13742](https://github.com/phalcon/cphalcon/issues/13742)
+- Renamed `Phalcon\Mvc\Url\Exception` to `Phalcon\Url\Exception` [#13742](https://github.com/phalcon/cphalcon/issues/13742)
 
 ## Removed
 - Removed the CSS/JS minifiers. This affects the Assets\Filter classes. For now the classes return the original content. [#13819](https://github.com/phalcon/cphalcon/issues/13819), [#10118](https://github.com/phalcon/cphalcon/issues/10118)

phalcon/di/factorydefault.zep

@@ -51,7 +51,7 @@ class FactoryDefault extends \Phalcon\Di
 			"security":           new Service("Phalcon\\Security", true),
 			"tag":                new Service("Phalcon\\Tag", true),
 			"transactionManager": new Service("Phalcon\\Mvc\\Model\\Transaction\\Manager", true),
-			"url":                new Service("Phalcon\\Mvc\\Url", true)
+			"url":                new Service("Phalcon\\Url", true)
 		];
 	}
 }

phalcon/di/injectable.zep

@@ -26,7 +26,7 @@ use Phalcon\Session\BagInterface;
  *
  * @property \Phalcon\Mvc\Dispatcher|\Phalcon\Mvc\DispatcherInterface $dispatcher
  * @property \Phalcon\Mvc\Router|\Phalcon\Mvc\RouterInterface $router
- * @property \Phalcon\Mvc\Url|\Phalcon\Mvc\UrlInterface $url
+ * @property \Phalcon\Url|\Phalcon\UrlInterface $url
  * @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

phalcon/http/response.zep

@@ -14,7 +14,7 @@ use Phalcon\DiInterface;
 use Phalcon\Http\Response\Exception;
 use Phalcon\Http\Response\HeadersInterface;
 use Phalcon\Http\Response\CookiesInterface;
-use Phalcon\Mvc\UrlInterface;
+use Phalcon\UrlInterface;
 use Phalcon\Mvc\ViewInterface;
 use Phalcon\Http\Response\Headers;
 use Phalcon\Di\InjectionAwareInterface;

phalcon/tag.zep

@@ -12,7 +12,7 @@ namespace Phalcon;
 
 use Phalcon\Tag\Select;
 use Phalcon\Tag\Exception;
-use Phalcon\Mvc\UrlInterface;
+use Phalcon\UrlInterface;
 
 /**
  * Phalcon\Tag

phalcon/mvc/url.zep → phalcon/url.zep

@@ -8,17 +8,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Mvc;
+namespace Phalcon;
 
 use Phalcon\DiInterface;
-use Phalcon\Mvc\UrlInterface;
-use Phalcon\Mvc\Url\Exception;
+use Phalcon\UrlInterface;
+use Phalcon\Url\Exception;
 use Phalcon\Mvc\RouterInterface;
 use Phalcon\Mvc\Router\RouteInterface;
 use Phalcon\Di\InjectionAwareInterface;
 
 /**
- * Phalcon\Mvc\Url
+ * Phalcon\Url
  *
  * This components helps in the generation of: URIs, URLs and Paths
  *
@@ -292,7 +292,7 @@ class Url implements UrlInterface, InjectionAwareInterface
 	{
 		let this->container = dependencyInjector;
 	}
-	
+
 	/**
 	 * Sets a prefix for all static URLs generated
 	 *

phalcon/mvc/url/exception.zep → phalcon/url/exception.zep

@@ -8,12 +8,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Mvc\Url;
+namespace Phalcon\Url;
 
 /**
- * Phalcon\Mvc\Url\Exception
+ * Phalcon\Url\Exception
  *
- * Exceptions thrown in Phalcon\Mvc\Url will use this class
+ * Exceptions thrown in Phalcon\Url will use this class
  */
 class Exception extends \Phalcon\Exception
 {

phalcon/mvc/urlinterface.zep → phalcon/urlinterface.zep

@@ -8,12 +8,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Mvc;
+namespace Phalcon;
 
 /**
- * Phalcon\Mvc\UrlInterface
+ * Phalcon\UrlInterface
  *
- * Interface for Phalcon\Mvc\UrlInterface
+ * Interface for Phalcon\UrlInterface
  */
 interface UrlInterface
 {

tests/_config/bootstrap.php

@@ -7,7 +7,7 @@
 use Phalcon\Mvc\Application;
 use Phalcon\Mvc\Dispatcher;
 use Phalcon\Mvc\Router;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 use Phalcon\Mvc\View;
 use Phalcon\Test\Fixtures\MemorySession as PhalconMemorySession;
 

tests/_data/fixtures/Traits/DiTrait.php

@@ -32,7 +32,7 @@
 use Phalcon\Http\Response;
 use Phalcon\Mvc\Models\Manager as ModelsManager;
 use Phalcon\Mvc\Models\Metadata\Memory as MetadataMemory;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\View\Simple;
 use Phalcon\Session\Adapter\Files as SessionFiles;

tests/integration/Mvc/View/Engine/Volt/CompilerCest.php

@@ -23,7 +23,7 @@
 use Phalcon\Escaper;
 use Phalcon\Forms\Element\Password;
 use Phalcon\Forms\Form;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\View\Engine\Volt;
 use Phalcon\Mvc\View\Engine\Volt\Compiler;

tests/integration/Mvc/Url/GetCest.php → tests/integration/Url/GetCest.php

@@ -10,27 +10,27 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Url;
+namespace Phalcon\Test\Integration\Url;
 
 use IntegrationTester;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 
 /**
  * Class GetCest
  */
 class GetCest
 {
     /**
-     * Tests Phalcon\Mvc\Url :: get()
+     * Tests Phalcon\Url :: get()
      *
      * @param IntegrationTester $I
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
-    public function mvcUrlGet(IntegrationTester $I)
+    public function urlGet(IntegrationTester $I)
     {
-        $I->wantToTest("Mvc\Url - get()");
+        $I->wantToTest("Url - get()");
         $url = new Url();
 
         $url->setBaseUri('https://phalconphp.com');

tests/integration/Mvc/Url/GetSetBasePathCest.php → tests/integration/Url/GetSetBasePathCest.php

@@ -10,29 +10,29 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Url;
+namespace Phalcon\Test\Integration\Url;
 
 use IntegrationTester;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 
 /**
  * Class GetSetBasePathCest
  *
- * @package Phalcon\Test\Integration\Mvc\Url
+ * @package Phalcon\Test\Integration\Url
  */
 class GetSetBasePathCest
 {
     /**
-     * Tests Phalcon\Mvc\Url :: getBasePath()/setBasePath()
+     * Tests Phalcon\Url :: getBasePath()/setBasePath()
      *
      * @param IntegrationTester $I
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
-    public function mvcUrlGetSetBasePath(IntegrationTester $I)
+    public function urlGetSetBasePath(IntegrationTester $I)
     {
-        $I->wantToTest("Mvc\Url - getBasePath()/setBasePath()");
+        $I->wantToTest("Url - getBasePath()/setBasePath()");
         $url = new Url();
 
         $path = '/en/team';

tests/integration/Mvc/Url/GetSetBaseUriCest.php → tests/integration/Url/GetSetBaseUriCest.php

@@ -10,29 +10,29 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Url;
+namespace Phalcon\Test\Integration\Url;
 
 use IntegrationTester;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 
 /**
  * Class GetSetBaseUriCest
  *
- * @package Phalcon\Test\Integration\Mvc\Url
+ * @package Phalcon\Test\Integration\Url
  */
 class GetSetBaseUriCest
 {
     /**
-     * Tests Phalcon\Mvc\Url :: getBaseUri()/setBaseUri()
+     * Tests Phalcon\Url :: getBaseUri()/setBaseUri()
      *
      * @param IntegrationTester $I
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
-    public function mvcUrlGetSetBaseUri(IntegrationTester $I)
+    public function urlGetSetBaseUri(IntegrationTester $I)
     {
-        $I->wantToTest("Mvc\Url - getBaseUri()/setBaseUri()");
+        $I->wantToTest("Url - getBaseUri()/setBaseUri()");
         $url = new Url();
 
         $path = 'https://phalconphp.com';

tests/integration/Mvc/Url/GetSetDICest.php → tests/integration/Url/GetSetDICest.php

@@ -10,30 +10,30 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Url;
+namespace Phalcon\Test\Integration\Url;
 
 use IntegrationTester;
 use Phalcon\Di;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 
 /**
  * Class GetSetDICest
  *
- * @package Phalcon\Test\Integration\Mvc\Url
+ * @package Phalcon\Test\Integration\Url
  */
 class GetSetDICest
 {
     /**
-     * Tests Phalcon\Mvc\Url :: getDI()/setDI()
+     * Tests Phalcon\Url :: getDI()/setDI()
      *
      * @param IntegrationTester $I
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
-    public function mvcUrlGetSetDI(IntegrationTester $I)
+    public function urlGetSetDI(IntegrationTester $I)
     {
-        $I->wantToTest("Mvc\Url - getDI()/setDI()");
+        $I->wantToTest("Url - getDI()/setDI()");
         $url       = new Url();
         $container = new Di();
 

tests/integration/Mvc/Url/GetSetStaticBaseUriCest.php → tests/integration/Url/GetSetStaticBaseUriCest.php

@@ -10,29 +10,29 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Url;
+namespace Phalcon\Test\Integration\Url;
 
 use IntegrationTester;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 
 /**
  * Class GetStaticBaseUriCest
  *
- * @package Phalcon\Test\Integration\Mvc\Url
+ * @package Phalcon\Test\Integration\Url
  */
 class GetSetStaticBaseUriCest
 {
     /**
-     * Tests Phalcon\Mvc\Url :: getStaticBaseUri()/setStaticBaseUri()
+     * Tests Phalcon\Url :: getStaticBaseUri()/setStaticBaseUri()
      *
      * @param IntegrationTester $I
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
-    public function mvcUrlGetSetStaticBaseUri(IntegrationTester $I)
+    public function urlGetSetStaticBaseUri(IntegrationTester $I)
     {
-        $I->wantToTest("Mvc\Url - getStaticBaseUri()/setStaticBaseUri()");
+        $I->wantToTest("Url - getStaticBaseUri()/setStaticBaseUri()");
         $url = new Url();
 
         $path = 'https://phalconphp.com';
@@ -44,17 +44,17 @@ public function mvcUrlGetSetStaticBaseUri(IntegrationTester $I)
     }
 
     /**
-     * Tests Phalcon\Mvc\Url :: getStaticBaseUri()/setStaticBaseUri() -
+     * Tests Phalcon\Url :: getStaticBaseUri()/setStaticBaseUri() -
      * getBaseUrl()
      *
      * @param IntegrationTester $I
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
-    public function mvcUrlGetSetStaticBaseUriGetBaseUri(IntegrationTester $I)
+    public function urlGetSetStaticBaseUriGetBaseUri(IntegrationTester $I)
     {
-        $I->wantToTest("Mvc\Url - getStaticBaseUri()/setStaticBaseUri() - getBaseUri()");
+        $I->wantToTest("Url - getStaticBaseUri()/setStaticBaseUri() - getBaseUri()");
         $url = new Url();
 
         $expected = 'https://phalconphp.com';

tests/integration/Mvc/Url/GetStaticCest.php → tests/integration/Url/GetStaticCest.php

@@ -10,27 +10,27 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Test\Integration\Mvc\Url;
+namespace Phalcon\Test\Integration\Url;
 
 use IntegrationTester;
-use Phalcon\Mvc\Url;
+use Phalcon\Url;
 
 /**
  * Class GetStaticCest
  */
 class GetStaticCest
 {
     /**
-     * Tests Phalcon\Mvc\Url :: getStatic()
+     * Tests Phalcon\Url :: getStatic()
      *
      * @param IntegrationTester $I
      *
      * @author Phalcon Team <team@phalconphp.com>
      * @since  2018-11-13
      */
-    public function mvcUrlGetStatic(IntegrationTester $I)
+    public function urlGetStatic(IntegrationTester $I)
     {
-        $I->wantToTest("Mvc\Url - getStatic()");
+        $I->wantToTest("Url - getStatic()");
         $url = new Url();
 
         $url->setStaticBaseUri('https://phalconphp.com');