Merge branch 'niden-T14359-tidy-up-di-classes' into 4.0.x

* niden-T14359-tidy-up-di-classes: [#14359] - Fixing appveyor [#14359] - Updated changelog [#14359] - Renamed Injectable again [#14359] - Trying require [#14359] - trying a hack for codeception [#14359] - Renamed DI classes to abstract* [#14349] - Updated the changelog [#14349] - Adjusting the interfaces again [#14349] - Corrected class name [#14349] - Added _before in the helper class [#14349] - Fixing test [#14349] - Fixing tests [#14349] - Correcting tests [#14349] - Changed the interfaces and added escaper to the constructor
phalcon · Sep 7, 2019 · cb74b41 · cb74b41
2 parents e9540a4 + 4899007
commit cb74b41
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 90 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -7,6 +7,7 @@
 - Changed `Phalcon\Session\Manager` to allow `router` in the constructor [#14351](https://github.com/phalcon/cphalcon/pull/14351)
 - Changed `Phalcon\Flash\Direct` to allow `escaper` in the constructor [#14349](https://github.com/phalcon/cphalcon/issues/14349)
 - Changed `Phalcon\Flash\Session` to allow `escaper` in the constructor [#14349](https://github.com/phalcon/cphalcon/issues/14349)
+- Changed `Phalcon\Di\AbstractDIAware` to `Phalcon\Di\AbstractInjectionAware` [#14359](https://github.com/phalcon/cphalcon/issues/14359)
 
 ## Fixed
 - Fixed `Phalcon\Helper\Str::includes` to return correct result [#14301](https://github.com/phalcon/cphalcon/issues/14301)
@@ -22,6 +23,9 @@
 - Fixed `Phalcon\Security::getSessionToken` return value [#14346](https://github.com/phalcon/cphalcon/issues/14346)
 - Fixed `Phalcon\Flash\*` interfaces for `message()` to return `string/null` [#14349](https://github.com/phalcon/cphalcon/issues/14349)
 
+## Removed
+- Removed `Phalcon\Plugin` - duplicate of `Phalcon\DI\Injectable` [#14359](https://github.com/phalcon/cphalcon/issues/14359)
+
 # [4.0.0-beta.2](https://github.com/phalcon/cphalcon/releases/tag/v4.0.0-beta.2) (2019-08-18)
 
 ## Fixed

diff --git a/ext/phalcon/plugin.zep.c b/ext/phalcon/plugin.zep.c
diff --git a/ext/phalcon/plugin.zep.h b/ext/phalcon/plugin.zep.h
diff --git a/phalcon/Assets/Manager.zep b/phalcon/Assets/Manager.zep
@@ -19,14 +19,14 @@ use Phalcon\Assets\Asset\Css as AssetCss;
 use Phalcon\Assets\Inline\Css as InlineCss;
 use Phalcon\Assets\Inline\Js as InlineJs;
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 
 /**
  * Phalcon\Assets\Manager
  *
  * Manages collections of CSS/Javascript assets
  */
-class Manager extends AbstractDiAware
+class Manager extends AbstractInjectionAware
 {
     protected collections;
 

diff --git a/phalcon/Cli/Router.zep b/phalcon/Cli/Router.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Cli;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Cli\Router\Route;
 use Phalcon\Cli\Router\Exception;
 
@@ -35,7 +35,7 @@ use Phalcon\Cli\Router\Exception;
  * echo $router->getTaskName();
  *```
  */
-class Router extends AbstractDiAware
+class Router extends AbstractInjectionAware
 {
     protected action;
 

diff --git a/phalcon/Di/AbstractDiAware.zep → phalcon/Di/AbstractInjectionAware.zep b/phalcon/Di/AbstractDiAware.zep → phalcon/Di/AbstractInjectionAware.zep
@@ -17,7 +17,7 @@ use Phalcon\Di\InjectionAwareInterface;
 /**
  * This abstract class offers common access to the DI in a class
  */
-abstract class AbstractDiAware implements InjectionAwareInterface
+abstract class AbstractInjectionAware implements InjectionAwareInterface
 {
     /**
      * Dependency Injector

diff --git a/phalcon/Dispatcher/AbstractDispatcher.zep b/phalcon/Dispatcher/AbstractDispatcher.zep
@@ -12,7 +12,7 @@ namespace Phalcon\Dispatcher;
 
 use Exception;
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Dispatcher\DispatcherInterface;
 use Phalcon\Dispatcher\Exception as PhalconException;
 use Phalcon\Events\EventsAwareInterface;
@@ -26,7 +26,7 @@ use Phalcon\Mvc\Model\BinderInterface;
  * This class can't be instantiated directly, you can use it to create your own
  * dispatchers.
  */
-abstract class AbstractDispatcher extends AbstractDiAware implements DispatcherInterface, EventsAwareInterface
+abstract class AbstractDispatcher extends AbstractInjectionAware implements DispatcherInterface, EventsAwareInterface
 {
     protected activeHandler;
 

diff --git a/phalcon/Flash/AbstractFlash.zep b/phalcon/Flash/AbstractFlash.zep
@@ -12,7 +12,7 @@ namespace Phalcon\Flash;
 
 use Phalcon\Di;
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Escaper\EscaperInterface;
 use Phalcon\Flash\Exception;
 
@@ -25,7 +25,7 @@ use Phalcon\Flash\Exception;
  * $flash->error("Cannot open the file");
  *```
  */
-abstract class AbstractFlash extends AbstractDiAware implements FlashInterface
+abstract class AbstractFlash extends AbstractInjectionAware implements FlashInterface
 {
     /**
      * @var bool

diff --git a/phalcon/Html/Tag.zep b/phalcon/Html/Tag.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Html;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Escaper;
 use Phalcon\Escaper\EscaperInterface;
 use Phalcon\Helper\Arr;
@@ -25,7 +25,7 @@ use Phalcon\Mvc\Model\ResultsetInterface;
  * Phalcon\Html\Tag is designed to simplify building of HTML tags. It provides a
  * set of helpers to dynamically generate HTML.
  */
-class Tag extends AbstractDiAware
+class Tag extends AbstractInjectionAware
 {
     /**
      * @var array

diff --git a/phalcon/Http/Cookie.zep b/phalcon/Http/Cookie.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Http;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Crypt\CryptInterface;
 use Phalcon\Crypt\Mismatch;
 use Phalcon\Filter\FilterInterface;
@@ -22,7 +22,7 @@ use Phalcon\Session\ManagerInterface as SessionManagerInterface;
 /**
  * Provide OO wrappers to manage a HTTP cookie.
  */
-class Cookie extends AbstractDiAware implements CookieInterface
+class Cookie extends AbstractInjectionAware implements CookieInterface
 {
     protected domain;
 

diff --git a/phalcon/Http/Request.zep b/phalcon/Http/Request.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Http;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Events\ManagerInterface;
 use Phalcon\Filter\FilterInterface;
 use Phalcon\Http\Request\File;
@@ -46,7 +46,7 @@ use stdClass;
  * $request->getLanguages();
  *```
  */
-class Request extends AbstractDiAware implements RequestInterface
+class Request extends AbstractInjectionAware implements RequestInterface
 {
     private filterService;
 

diff --git a/phalcon/Http/Response/Cookies.zep b/phalcon/Http/Response/Cookies.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Http\Response;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Http\CookieInterface;
 use Phalcon\Http\Response\CookiesInterface;
 use Phalcon\Http\Cookie\Exception;
@@ -64,7 +64,7 @@ use Phalcon\Http\Cookie\Exception;
  * );
  * ```
  */
-class Cookies extends AbstractDiAware implements CookiesInterface
+class Cookies extends AbstractInjectionAware implements CookiesInterface
 {
     protected cookies = [];
 

diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
@@ -15,7 +15,7 @@ use Phalcon\Db\Column;
 use Phalcon\Db\DialectInterface;
 use Phalcon\Db\Enum;
 use Phalcon\Db\RawValue;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Di;
 use Phalcon\Di\DiInterface;
 use Phalcon\Events\ManagerInterface as EventsManagerInterface;
@@ -81,7 +81,7 @@ use Serializable;
  * }
  * ```
  */
-abstract class Model extends AbstractDiAware implements EntityInterface, ModelInterface, ResultInterface, Serializable, JsonSerializable
+abstract class Model extends AbstractInjectionAware implements EntityInterface, ModelInterface, ResultInterface, Serializable, JsonSerializable
 {
     const DIRTY_STATE_DETACHED   = 2;
     const DIRTY_STATE_PERSISTENT = 0;

diff --git a/phalcon/Mvc/Router.zep b/phalcon/Mvc/Router.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Mvc;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
 use Phalcon\Http\RequestInterface;
@@ -48,7 +48,7 @@ use Phalcon\Mvc\Router\RouteInterface;
  * echo $router->getControllerName();
  * ```
  */
-class Router extends AbstractDiAware implements RouterInterface, EventsAwareInterface
+class Router extends AbstractInjectionAware implements RouterInterface, EventsAwareInterface
 {
     const POSITION_FIRST = 0;
     const POSITION_LAST = 1;

diff --git a/phalcon/Plugin.zep b/phalcon/Plugin.zep
diff --git a/phalcon/Security.zep b/phalcon/Security.zep
@@ -11,7 +11,7 @@
 namespace Phalcon;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Http\RequestInterface;
 use Phalcon\Security\Random;
 use Phalcon\Security\Exception;
@@ -34,7 +34,7 @@ use Phalcon\Session\ManagerInterface as SessionInterface;
  * }
  *```
  */
-class Security extends AbstractDiAware
+class Security extends AbstractInjectionAware
 {
     const CRYPT_DEFAULT    = 0;
     const CRYPT_BLOWFISH   = 4;

diff --git a/phalcon/Session/Manager.zep b/phalcon/Session/Manager.zep
@@ -13,7 +13,7 @@ namespace Phalcon\Session;
 use InvalidArgumentException;
 use RuntimeException;
 use SessionHandlerInterface;
-use Phalcon\DI\AbstractDiAware;
+use Phalcon\DI\AbstractInjectionAware;
 use Phalcon\Di\DiInterface;
 use Phalcon\Helper\Arr;
 use Phalcon\Session\ManagerInterface;
@@ -23,7 +23,7 @@ use Phalcon\Session\ManagerInterface;
  *
  * Session manager class
  */
-class Manager extends AbstractDiAware implements ManagerInterface
+class Manager extends AbstractInjectionAware implements ManagerInterface
 {
     /**
      * @var <SessionHandlerInterface>|null

diff --git a/phalcon/Url.zep b/phalcon/Url.zep
@@ -11,7 +11,7 @@
 namespace Phalcon;
 
 use Phalcon\Di\DiInterface;
-use Phalcon\Di\AbstractDiAware;
+use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Mvc\RouterInterface;
 use Phalcon\Mvc\Router\RouteInterface;
 use Phalcon\Url\Exception;
@@ -34,7 +34,7 @@ use Phalcon\Url\UrlInterface;
  * );
  *```
  */
-class Url extends AbstractDiAware implements UrlInterface
+class Url extends AbstractInjectionAware implements UrlInterface
 {
     /**
      * @var null | string