From d03824518d5ad9a716b061a8b5868b3a3565c2be Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:57:13 +0200 Subject: [PATCH] Change Phalcon\Mvc\User\Plugin to Phalcon\Di\Injectable --- app/listeners/AccessListener.php | 6 +++--- app/listeners/ActivityLog.php | 4 ++-- app/listeners/DispatchListener.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/listeners/AccessListener.php b/app/listeners/AccessListener.php index e51301c..4f6099a 100644 --- a/app/listeners/AccessListener.php +++ b/app/listeners/AccessListener.php @@ -2,14 +2,14 @@ namespace App\Listener; -use Phalcon\Events\Event, +use Phalcon\Di\Injectable, + Phalcon\Events\Event, Phalcon\Mvc\Dispatcher, - Phalcon\Mvc\User\Plugin, Phalcon\Mvc\Dispatcher\Exception as DispatcherException; use Httpcb\Acl; -class AccessListener extends Plugin +class AccessListener extends Injectable { protected $_ignored_resources = [ 'index', diff --git a/app/listeners/ActivityLog.php b/app/listeners/ActivityLog.php index f7f281e..23a9082 100644 --- a/app/listeners/ActivityLog.php +++ b/app/listeners/ActivityLog.php @@ -2,14 +2,14 @@ namespace App\Listener; -use Phalcon\Mvc\User\Plugin, +use Phalcon\Di\Injectable, Phalcon\Events\Event, App\Model\Data\User, App\Model\Data\ActivityLog as ActivityLogger, Httpcb\OAuth\UserData\UserDataInterface as OAuthUserDataInterface, Httpcb\Auth; -class ActivityLog extends Plugin +class ActivityLog extends Injectable { /** * @var ActivityLogger diff --git a/app/listeners/DispatchListener.php b/app/listeners/DispatchListener.php index 1cd9ff1..650c4e3 100644 --- a/app/listeners/DispatchListener.php +++ b/app/listeners/DispatchListener.php @@ -4,7 +4,7 @@ namespace App\Listener; use Exception, Phalcon\Events\Event, - Phalcon\Mvc\User\Plugin, + Phalcon\Di\Injectable, Phalcon\Mvc\Dispatcher, Phalcon\Mvc\Dispatcher\Exception as DispatcherException; @@ -14,7 +14,7 @@ use Exception, * Plugin for forwarding user to 404 (not found) page * if a request could not be dispatched. */ -class DispatchListener extends Plugin +class DispatchListener extends Injectable { protected $_route_notfound = array( 'controller' => 'error',