GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hugo Sales 2020-06-23 20:37:29 +00:00 committed by Hugo Sales
parent b32e173749
commit b7a8861f55
Signed by: someonewithpc
GPG Key ID: 7D0C7EAFC9D835A0
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Controller/NetworkPublic.php
View File

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

3
src/Core/GSEvent.php → src/Core/Event.php
View File

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

2
src/Core/GNUsocial.php
View File

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

2
src/Core/ModulesManager.php
View File

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