update to hhvm 4.56 and contract 1.1

.travis.yml

@@ -5,8 +5,7 @@ os:
   - linux
 
 env:
-  - HHVM_VERSION=4.25-latest
-  - HHVM_VERSION=4.30-latest
+  - HHVM_VERSION=4.56-latest
   - HHVM_VERSION=latest
   - HHVM_VERSION=nightly
 

composer.json

@@ -14,9 +14,9 @@
         }
     ],
     "require": {
-        "hhvm": "^4.25",
-        "hhvm/hsl": "^4.25",
-        "his/container": "^0.1"
+        "hhvm": "^4.56",
+        "hhvm/hsl": "^4.40",
+        "nuxed/contract": "^1.1"
     },
     "require-dev": {
         "facebook/fbexpect": "^2.7",
@@ -33,4 +33,4 @@
         "test": "hacktest tests/",
         "type-check": "hh_client src/"
     }
-}
+}

src/Nuxed/EventDispatcher/EventDispatcher.hack

@@ -1,23 +1,21 @@
 namespace Nuxed\EventDispatcher;
 
 use namespace HH\Lib;
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
-
-final class EventDispatcher implements IEventDispatcher {
+use namespace Nuxed\Contract\EventDispatcher;
+use namespace Nuxed\Contract\EventDispatcher\{
+  Event,
+  EventListener,
+  ListenerProvider,
+};
+
+final class EventDispatcher implements EventDispatcher\IEventDispatcher {
   public function __construct(
     private ListenerProvider\IListenerProvider $listenerProvider,
   ) {}
 
   /**
    * Provide all relevant listeners with an event to process.
    *
-   * If a Throwable is caught when executing the listener loop, it is cast
-   * to an ErrorEvent, and then the method calls itself with that instance,
-   * re-throwing the original Throwable on completion.
-   *
-   * In the case that a Throwable is caught for an ErrorEvent, we re-throw
-   * to prevent recursion.
-   *
    * @template T as IEvent
    *
    * @return T The Event that was passed, now modified by listeners.
@@ -46,35 +44,11 @@ final class EventDispatcher implements IEventDispatcher {
           return;
         }
 
-        try {
-          await $listener->process($event);
-        } catch (\Exception $e) {
-          if ($event is Event\ErrorEvent<_>) {
-            throw new Exception\InvalidListenerException('');
-            throw $event->getException();
-          }
-
-          await $this->handleCaughtException<T>($e, $event, $listener);
-        }
+        await $listener->process($event);
       };
     }
 
     await $lastOperation;
     return $event;
   }
-
-  private async function handleCaughtException<
-    <<__Enforceable>> reify T as Event\IEvent,
-  >(
-    \Exception $e,
-    T $event,
-    EventListener\IEventListener<T> $listener,
-  ): Awaitable<noreturn> {
-    await $this->dispatch<Event\ErrorEvent<T>>(
-      new Event\ErrorEvent<T>($event, $listener, $e),
-    );
-
-    // Re-throw the original exception, per the spec.
-    throw $e;
-  }
 }

src/Nuxed/EventDispatcher/EventListener/CallableEventListener.hack

@@ -1,12 +1,12 @@
 namespace Nuxed\EventDispatcher\EventListener;
 
-use namespace Nuxed\EventDispatcher\Event;
+use namespace Nuxed\Contract\EventDispatcher\{Event, EventListener};
 
 /**
  * Decorator defines a callable listener for an event.
  */
 final class CallableEventListener<T as Event\IEvent>
-  implements IEventListener<T> {
+  implements EventListener\IEventListener<T> {
   public function __construct(
     private (function(T): Awaitable<void>) $listener,
   ) {}

src/Nuxed/EventDispatcher/EventListener/callable.hack

@@ -1,6 +1,6 @@
 namespace Nuxed\EventDispatcher\EventListener;
 
-use namespace Nuxed\EventDispatcher\Event;
+use namespace Nuxed\Contract\EventDispatcher\{Event, EventListener};
 
 /**
  * Helper function to create an event listener,
@@ -10,6 +10,6 @@ use namespace Nuxed\EventDispatcher\Event;
  */
 function callable<T as Event\IEvent>(
   (function(T): Awaitable<void>) $listener,
-): IEventListener<T> {
+): EventListener\IEventListener<T> {
   return new CallableEventListener($listener);
 }

src/Nuxed/EventDispatcher/EventListener/lazy.hack

@@ -1,17 +1,17 @@
 namespace Nuxed\EventDispatcher\EventListener;
 
-use namespace His\Container;
-use namespace Nuxed\EventDispatcher\Event;
+use namespace Nuxed\Contract\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\Container;
 
 /**
  * Helper function to create a lazy loaded event listener.
  */
 function lazy<T as Event\IEvent>(
-  Container\ContainerInterface $container,
-  classname<IEventListener<T>> $service,
-): IEventListener<T> {
+  Container\IContainer $container,
+  classname<EventListener\IEventListener<T>> $service,
+): EventListener\IEventListener<T> {
   return callable<T>(
-    (T $event) ==>
-      $container->get<IEventListener<T>>($service)->process($event),
+    (T $event) ==> $container->get<EventListener\IEventListener<T>>($service)
+      ->process($event),
   );
 }

src/Nuxed/EventDispatcher/ListenerProvider/AttachableListenerProvider.hack

@@ -1,7 +1,7 @@
 namespace Nuxed\EventDispatcher\ListenerProvider;
 
 use namespace HH\Lib\C;
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\EventDispatcher\{Event, EventListener};
 
 /**
  * The `AttachableListenerProvider` is a built-in implementation for `IAttachableListenerProvider`

src/Nuxed/EventDispatcher/ListenerProvider/IAttachableListenerProvider.hack

@@ -1,16 +1,21 @@
 namespace Nuxed\EventDispatcher\ListenerProvider;
 
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\EventDispatcher\{
+  Event,
+  EventListener,
+  ListenerProvider,
+};
 
 /**
  * The `IAttachableListenerProvider` listener provider allows you to attach event listeners,
  * to the provider after construction.
  *
  * Event listeners returned by `getListener($event)`, will be in the same order they were added in.
  *
- * @see Nuxed\EventDispatcher\ListenerProvider\IListenerProvider::getListeners()
+ * @see Nuxed\Contract\EventDispatcher\ListenerProvider\IListenerProvider::getListeners()
  */
-interface IAttachableListenerProvider extends IListenerProvider {
+interface IAttachableListenerProvider
+  extends ListenerProvider\IListenerProvider {
   /**
    * Attach a listener to the given event.
    */

src/Nuxed/EventDispatcher/ListenerProvider/IPrioritizedListenerProvider.hack

@@ -1,14 +1,14 @@
 namespace Nuxed\EventDispatcher\ListenerProvider;
 
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\EventDispatcher\{Event, EventListener};
 
 /**
  * The `IPrioritizedListenerProvider` listener provider allows you to attach event listeners,
  * to the provider after construction, with a given priority.
  *
  * Event listeners returned by `getListener($event)`, will be in the ordered by priority.
  *
- * @see Nuxed\EventDispatcher\ListenerProvider\IListenerProvider::getListeners()
+ * @see Nuxed\Contract\EventDispatcher\ListenerProvider\IListenerProvider::getListeners()
  */
 interface IPrioritizedListenerProvider extends IAttachableListenerProvider {
   /**

src/Nuxed/EventDispatcher/ListenerProvider/IReifiedListenerProvider.hack

@@ -1,14 +1,18 @@
 namespace Nuxed\EventDispatcher\ListenerProvider;
 
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\EventDispatcher\{
+  Event,
+  EventListener,
+  ListenerProvider,
+};
 
 /**
  * The `IReifiedListenerProvider` uses reified generics features to determine the event type,
  * instead of recieving it as an argument.
  *
- * @see Nuxed\EventDispatcher\ListenerProvider\IListenerProvider::getListeners()
+ * @see Nuxed\Contract\EventDispatcher\ListenerProvider\IListenerProvider::getListeners()
  */
-interface IReifiedListenerProvider extends IListenerProvider {
+interface IReifiedListenerProvider extends ListenerProvider\IListenerProvider {
   /**
    * Attach a listener
    */

src/Nuxed/EventDispatcher/ListenerProvider/ListenerProviderAggregate.hack

@@ -1,15 +1,20 @@
 namespace Nuxed\EventDispatcher\ListenerProvider;
 
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\EventDispatcher\{
+  Event,
+  EventListener,
+  ListenerProvider,
+};
 
 /**
  * The `ListenerProviderAggregate` allows you to combine multiple listener providers,
  * to use with the same event dispatcher.
  *
  * @see Nuxed\EventDispatcher\ListenerProviderAggregate::attach()
  */
-final class ListenerProviderAggregate implements IListenerProvider {
-  private vec<IListenerProvider> $providers = vec[];
+final class ListenerProviderAggregate
+  implements ListenerProvider\IListenerProvider {
+  private vec<ListenerProvider\IListenerProvider> $providers = vec[];
 
   /**
    * {@inheritdoc}
@@ -27,7 +32,7 @@ final class ListenerProviderAggregate implements IListenerProvider {
   /**
    * Attach a listener provider to the listeners aggregate.
    */
-  public function attach(IListenerProvider $provider): void {
+  public function attach(ListenerProvider\IListenerProvider $provider): void {
     $this->providers[] = $provider;
   }
 }

src/Nuxed/EventDispatcher/ListenerProvider/PrioritizedListenerProvider.hack

@@ -1,7 +1,7 @@
 namespace Nuxed\EventDispatcher\ListenerProvider;
 
 use namespace HH\Lib\{C, Str, Vec};
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\EventDispatcher\{Event, EventListener};
 
 /**
  * The `PrioritizedListenerProvider` is a built-in implementation for `IPrioritizedListenerProvider`

src/Nuxed/EventDispatcher/ListenerProvider/RandomizedListenerProvider.hack

@@ -1,7 +1,7 @@
 namespace Nuxed\EventDispatcher\ListenerProvider;
 
 use namespace HH\Lib\{C, Vec};
-use namespace Nuxed\EventDispatcher\{Event, EventListener};
+use namespace Nuxed\Contract\EventDispatcher\{Event, EventListener};
 
 /**
  * The `RandomizedListenerProvider` is a built-in implementation for `IRandomizedListenerProvider`