[CORE][Event] Move GSEvent to Event, no longer a name collision

This commit is contained in:
Hugo Sales 2020-06-23 20:37:29 +00:00 committed by Hugo Sales
parent 07422c4e1a
commit bf92c44d81
4 changed files with 3 additions and 7 deletions

View File

@ -17,7 +17,6 @@
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
/**
* Handle network public feed
*
@ -31,7 +30,7 @@
namespace App\Controller;
use App\Core\GSEvent as Event;
use App\Core\Event;
use App\Util\Common;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;

View File

@ -17,7 +17,6 @@
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
/**
* GNU social's event handler wrapper around Symfony's,
* keeping our old interface, which is more convenient and just as powerful
@ -35,7 +34,7 @@ namespace App\Core;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
abstract class GSEvent
abstract class Event
{
/**
* Constants to be returned from event handlers, for increased clarity

View File

@ -87,7 +87,7 @@ class GNUsocial implements EventSubscriberInterface
public function register(EventDispatcherInterface $event_dispatcher): void
{
Log::setLogger($this->logger);
GSEvent::setDispatcher($event_dispatcher);
Event::setDispatcher($event_dispatcher);
I18nHelper::setTranslator($this->translator);
DB::setManager($this->entity_manager);
Router::setRouter($this->router);

View File

@ -17,7 +17,6 @@
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
// }}}
/**
* Module and plugin loader code, one of the main features of GNU social
*
@ -35,7 +34,6 @@
namespace App\Core;
use Functional as F;
use GSEvent as Event;
abstract class ModulesManager
{