From aababdcb12d4e4ee1598fd39629c66fac1d30eb2 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:53:31 +0200 Subject: [PATCH] Phalcon\DiInterface is renamed to Phalcon\Di\DiInterface --- app/library/Bootstrap.php | 2 +- app/library/ViewHelper/AbstractHelper.php | 12 ++++++------ app/library/ViewHelper/Service.php | 12 ++++++------ app/library/ViewHelper/Volt/Extension.php | 12 ++++++------ app/modules/Base.php | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/library/Bootstrap.php b/app/library/Bootstrap.php index e6bc471..03edaaf 100644 --- a/app/library/Bootstrap.php +++ b/app/library/Bootstrap.php @@ -4,7 +4,7 @@ namespace Httpcb; use Phalcon\Di\FactoryDefault as DiDefault; use Phalcon\Di\Injectable; -use Phalcon\DiInterface; +use Phalcon\Di\DiInterface; use Phalcon\Mvc\Application; class Bootstrap extends Injectable diff --git a/app/library/ViewHelper/AbstractHelper.php b/app/library/ViewHelper/AbstractHelper.php index 916f4a2..ff5fe01 100644 --- a/app/library/ViewHelper/AbstractHelper.php +++ b/app/library/ViewHelper/AbstractHelper.php @@ -2,7 +2,7 @@ namespace Httpcb\ViewHelper; -use Phalcon\DiInterface; +use Phalcon\Di\DiInterface; use Phalcon\Di\InjectionAwareInterface; abstract class AbstractHelper implements InjectionAwareInterface @@ -12,19 +12,19 @@ abstract class AbstractHelper implements InjectionAwareInterface /** * Sets the dependency injector * - * @param mixed $dependencyInjector + * @param DiInterface $container */ - public function setDI(DiInterface $dependencyInjector) + public function setDI(DiInterface $container) : void { - $this->_di = $dependencyInjector; + $this->_di = $container; } /** * Returns the internal dependency injector * - * @return \Phalcon\DiInterface + * @return DiInterface */ - public function getDI() + public function getDI() : DiInterface { return $this->_di; } diff --git a/app/library/ViewHelper/Service.php b/app/library/ViewHelper/Service.php index 2a11d2b..1e20f72 100644 --- a/app/library/ViewHelper/Service.php +++ b/app/library/ViewHelper/Service.php @@ -2,7 +2,7 @@ namespace Httpcb\ViewHelper; -use Phalcon\DiInterface, +use Phalcon\Di\DiInterface, Phalcon\Di\InjectionAwareInterface; class Service implements InjectionAwareInterface @@ -14,19 +14,19 @@ class Service implements InjectionAwareInterface /** * Sets the dependency injector * - * @param mixed $dependencyInjector + * @param DiInterface $container */ - public function setDI(DiInterface $dependencyInjector) + public function setDI(DiInterface $container) : void { - $this->_di = $dependencyInjector; + $this->_di = $container; } /** * Returns the internal dependency injector * - * @return \Phalcon\DiInterface + * @return DiInterface */ - public function getDI() + public function getDI() : DiInterface { return $this->_di; } diff --git a/app/library/ViewHelper/Volt/Extension.php b/app/library/ViewHelper/Volt/Extension.php index c9f4550..b38eb34 100644 --- a/app/library/ViewHelper/Volt/Extension.php +++ b/app/library/ViewHelper/Volt/Extension.php @@ -2,7 +2,7 @@ namespace Httpcb\ViewHelper\Volt; -use Phalcon\DiInterface, +use Phalcon\Di\DiInterface, Phalcon\Di\InjectionAwareInterface; class Extension implements InjectionAwareInterface @@ -38,19 +38,19 @@ class Extension implements InjectionAwareInterface /** * Sets the dependency injector * - * @param mixed $dependencyInjector + * @param DiInterface $container */ - public function setDI(DiInterface $dependencyInjector) + public function setDI(DiInterface $container) : void { - $this->_di = $dependencyInjector; + $this->_di = $container; } /** * Returns the internal dependency injector * - * @return \Phalcon\DiInterface + * @return DiInterface */ - public function getDI() + public function getDI() : DiInterface { return $this->_di; } diff --git a/app/modules/Base.php b/app/modules/Base.php index 85e1c69..2e2b5a3 100644 --- a/app/modules/Base.php +++ b/app/modules/Base.php @@ -3,7 +3,7 @@ namespace App\Module; use Phalcon\Loader, - Phalcon\DiInterface, + Phalcon\Di\DiInterface, Phalcon\Mvc\Dispatcher, Phalcon\Mvc\ModuleDefinitionInterface;