Update interface for now

config/bootstrap_cli.php

@@ -1,9 +1,8 @@
 <?php
 use Cake\Event\Event;
 use Cake\Event\EventManager;
-use Josegonzalez\Version\Event\Bake\TableEvent;
+use Josegonzalez\Version\Event\VersionListener;
 
 EventManager::instance()->attach(function (Event $event) {
-    $tableEvent = new TableEvent($event);
-    $tableEvent();
+    (new VersionListener($event))->execute();
 }, 'Bake.beforeRender');

src/Event/Bake/Event.php → src/Event/EventListener.php

@@ -1,11 +1,11 @@
 <?php
-namespace Josegonzalez\Version\Event\Bake;
+namespace Josegonzalez\Version\Event;
 
 use Cake\Event\Event as CakeEvent;
 use Cake\Event\EventListenerInterface;
 use Cake\Event\EventManagerTrait;
 
-abstract class Event implements EventListenerInterface
+abstract class EventListener implements EventListenerInterface
 {
     use EventManagerTrait;
 
@@ -32,7 +32,7 @@ public function __construct(CakeEvent $event)
      *
      * @return void
      */
-    public function __invoke()
+    public function execute()
     {
         $methods = array_values($this->implementedEvents());
         foreach ($methods as $method) {

src/Event/Bake/TableEvent.php → src/Event/VersionListener.php

@@ -1,20 +1,20 @@
 <?php
-namespace Josegonzalez\Version\Event\Bake;
+namespace Josegonzalez\Version\Event;
 
 use Cake\Datasource\ConnectionManager;
-use Cake\Event\Event as CakeEvent;
+use Cake\Event\Event;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Hash;
 
-class TableEvent extends Event
+class VersionListener extends EventListener
 {
     /**
      * Called before the entity template is rendered
      *
      * @param Event $event An Event instance
      * @return void
      */
-    public function beforeRenderEntity(CakeEvent $event)
+    public function beforeRenderEntity(Event $event)
     {
         $this->_checkAssociation($event, 'versions');
     }
@@ -25,7 +25,7 @@ public function beforeRenderEntity(CakeEvent $event)
      * @param Event $event An Event instance
      * @return void
      */
-    public function beforeRenderTestCase(CakeEvent $event)
+    public function beforeRenderTestCase(Event $event)
     {
         $name = $event->subject->viewVars['subject'];
         $pattern = '/^' . preg_quote($name) . '_(\w+)_version$/';
@@ -42,7 +42,7 @@ public function beforeRenderTestCase(CakeEvent $event)
      * @param Event $event An Event instance
      * @return void
      */
-    public function beforeRenderTable(CakeEvent $event)
+    public function beforeRenderTable(Event $event)
     {
         $this->_checkAssociation($event, 'versions');
         $this->_fixVersionTables($event);
@@ -54,7 +54,7 @@ public function beforeRenderTable(CakeEvent $event)
      * @param Event $event An Event instance
      * @return void
      */
-    protected function _fixVersionTables(CakeEvent $event)
+    protected function _fixVersionTables(Event $event)
     {
         if (!preg_match('/Versions$/', $event->subject->viewVars['name'])) {
             return;
@@ -75,7 +75,7 @@ protected function _fixVersionTables(CakeEvent $event)
      * @param string $tableSuffix a suffix for the primary table
      * @return boolean true if modified, false otherwise
      */
-    protected function _checkAssociation(CakeEvent $event, $tableSuffix)
+    protected function _checkAssociation(Event $event, $tableSuffix)
     {
         $subject = $event->subject;
         $connection = ConnectionManager::get($subject->viewVars['connection']);
@@ -102,7 +102,7 @@ protected function _checkAssociation(CakeEvent $event, $tableSuffix)
      * @param Event $event An Event instance
      * @return array
      */
-    protected function _modifyBelongsTo(CakeEvent $event)
+    protected function _modifyBelongsTo(Event $event)
     {
         $belongsTo = $event->subject->viewVars['associations']['belongsTo'];
 
@@ -122,7 +122,7 @@ protected function _modifyBelongsTo(CakeEvent $event)
      * @param Event $event An Event instance
      * @return array
      */
-    protected function _modifyRulesChecker(CakeEvent $event)
+    protected function _modifyRulesChecker(Event $event)
     {
         $rulesChecker = $event->subject->viewVars['rulesChecker'];