Apply fixtures commit

.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 
 matrix:
   include:
+    - php: 7.2
       env: SCRUTINIZER=1
       env: COMPOSER_FLAGS="--prefer-lowest"
-    - php: 7.2
     - php: 7.3
     - php: nightly
   allow_failures:
@@ -22,7 +22,6 @@ install:
 before_install:
     - composer self-update
     - phpenv config-rm xdebug.ini || true
-    - composer require phpunit/phpunit ^7.5
 
 before_script:
   - composer update $COMPOSER_FLAGS --prefer-dist

composer.json

@@ -23,22 +23,23 @@
     "require": {
         "php": "^7.2",
         "psr/log": "^1.1",
+        "biurad/biurad-helpers": "^0.1",
         "symfony/event-dispatcher-contracts": "^1.1|^2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.0"
+        "phpunit/phpunit": "^8.4"
     },
     "autoload": {
         "psr-4": {
-            "BiuradPHP\\Event\\": "src/"
+            "BiuradPHP\\Events\\": "src/"
         },
         "exclude-from-classmap": [
             "/Tests/"
         ]
     },
     "autoload-dev": {
         "psr-4": {
-            "BiuradPHP\\Event\\Tests\\": "Tests/"
+            "BiuradPHP\\Events\\Tests\\": "Tests/"
         }
     },
     "minimum-stability": "dev",

src/Concerns/StoppableTrait.php

@@ -31,8 +31,7 @@ trait StoppableTrait
      * This will typically only be used by the Dispatcher to determine if the
      * previous listener halted propagation.
      *
-     * @return bool
-     *              True if the Event is complete and no further listeners should be called.
+     * @return bool True if the Event is complete and no further listeners should be called.
      *              False to continue calling listeners.
      */
     public function isPropagationStopped(): bool

src/EventAnnotation.php

@@ -19,10 +19,9 @@
 
 namespace BiuradPHP\Events;
 
-use BiuradPHP\Events\Interfaces\EventBroadcastInterface;
 use BiuradPHP\Events\Interfaces\EventDispatcherInterface;
 use BiuradPHP\Events\Interfaces\EventSubscriberInterface;
-use BiuradPHP\Loader\AnnotationLocator;
+use BiuradPHP\Loader\Annotations\AnnotationLoader;
 use BiuradPHP\Loader\Interfaces\AnnotationInterface;
 use ReflectionClass;
 use ReflectionMethod;
@@ -81,22 +80,13 @@ public function __construct(EventDispatcherInterface $events)
     /**
      * Load the annoatation for events.
      *
-     * @param AnnotationLocator $annotation
+     * @param AnnotationLoader $annotation
      */
-    public function register(AnnotationLocator $annotation): void
+    public function register(AnnotationLoader $annotation): void
     {
-        /**
-         * @var  ReflectionClass $reflector
-         * @var  Annotation\Listener $classAnnotation
-         */
-        foreach ($annotation->findClasses($this->eventAnnotationClass) as [$reflector, $classAnnotation]) {
-            if ($reflector->implementsInterface(EventBroadcastInterface::class)) {
-                $this->events->addListener(
-                    $classAnnotation->getEvent(),
-                    $reflector->getName(),
-                    $classAnnotation->getPriority()
-                );
-            } elseif ($reflector->implementsInterface(EventSubscriberInterface::class)) {
+        /** @var  ReflectionClass $reflector */
+        foreach ($annotation->findClasses($this->eventAnnotationClass) as [$reflector,]) {
+            if ($reflector->implementsInterface(EventSubscriberInterface::class)) {
                 $this->events->addSubscriber($reflector->getName());
             }
         }