Updated to PHP7.4

- Removed dependency on tale-dev-tool - Added property typing
Talesoft · Mar 11, 2020 · 62484e7 · 62484e7
1 parent 08d6f36
commit 62484e7
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,12 @@
-
 language: php
-
 git:
     depth: 5
-
 php:
-    - 7.2
-    - 7.3
-
+    - 7.4
 install:
     - travis_retry composer clear-cache
     - travis_retry composer self-update
     - travis_retry composer install
-
 script:
-    - vendor/bin/tale-dev check --report --coverage-php-version=7.2
-
-addons:
-    code_climate:
-        repo_token: b046f38e1a113e8ea7ec3e3173db1754b87b7858599f16f7f8d0f3f7a0ea6a3c
+    - composer lint
+    - composer test
diff --git a/composer.json b/composer.json
@@ -5,14 +5,20 @@
     "description": "A PSR-14 implementation",
     "license": "MIT",
     "homepage": "https://talesoft.codes",
+    "scripts": {
+        "test": "phpunit",
+        "test:coverage-html": "phpunit --coverage-html=coverage",
+        "lint": "phpcs",
+        "lint:fix": "phpcbf"
+    },
     "authors": [
         {
             "name": "Torben Köhn",
             "email": "torben@talesoft.codes"
         }
     ],
     "require": {
-        "php": ">=7.1.0",
+        "php": ">=7.4.0",
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/event-dispatcher": "^1.0"
@@ -25,6 +31,7 @@
         "files": ["src/functions.php"]
     },
     "require-dev": {
-        "talesoft/tale-dev-tool": "dev-master"
+        "phpunit/phpunit": "^8.4",
+        "squizlabs/php_codesniffer": "^3.5"
     }
 }
diff --git a/phpcs.xml b/phpcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<ruleset name="PSR-2">
+    <rule ref="PSR2"/>
+    <file>./src</file>
+    <file>./tests</file>
+</ruleset>
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.4/phpunit.xsd"
+         colors="true"
+         bootstrap="./vendor/autoload.php"
+         forceCoversAnnotation="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         verbose="true">
+    <testsuites>
+        <testsuite name="Talesoft - Tale Event">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Event/AbstractStoppableEvent.php b/src/Event/AbstractStoppableEvent.php
@@ -4,10 +4,7 @@
 
 abstract class AbstractStoppableEvent implements StoppableEventInterface
 {
-    /**
-     * @var bool
-     */
-    private $propagationStopped;
+    private bool $propagationStopped;
 
     public function __construct(bool $propagationStopped = false)
     {

diff --git a/src/Event/ListenerProvider/ChainListenerProvider.php b/src/Event/ListenerProvider/ChainListenerProvider.php
@@ -9,7 +9,7 @@ final class ChainListenerProvider implements ListenerProviderInterface
     /**
      * @var iterable<ListenerProviderInterface>
      */
-    private $providers;
+    private iterable $providers;
 
     /**
      * ChainListenerProvider constructor.

diff --git a/src/Event/ListenerProvider/ClassMapListenerProvider.php b/src/Event/ListenerProvider/ClassMapListenerProvider.php
@@ -9,7 +9,7 @@ final class ClassMapListenerProvider implements ListenerProviderInterface
     /**
      * @var callable[][]
      */
-    private $classMap;
+    private array $classMap;
 
     public function __construct(array $classMap)
     {

diff --git a/src/Event/ListenerProvider/ReflectionListenerProvider.php b/src/Event/ListenerProvider/ReflectionListenerProvider.php
@@ -10,10 +10,7 @@
 
 final class ReflectionListenerProvider implements ListenerProviderInterface, ListenerRegistryInterface
 {
-    /**
-     * @var SplObjectStorage
-     */
-    private $listeners;
+    private SplObjectStorage $listeners;
 
     public function __construct(iterable $listeners = [])
     {
@@ -26,21 +23,21 @@ public function __construct(iterable $listeners = [])
     public function addListener(Closure $handler): void
     {
         try {
-            $refl = new \ReflectionFunction($handler);
+            $reflection = new \ReflectionFunction($handler);
         } catch (\Exception $ex) {
-            throw new InvalidListenerException('Failed to reflect closure', $ex);
+            throw new InvalidListenerException('Failed to reflect closure. See inner exception for details.', $ex);
         }
-        $parameters = $refl->getParameters();
+
+        $parameters = $reflection->getParameters();
         if (count($parameters) !== 1) {
-            throw new InvalidListenerException('Closure needs to have exactly one parameter');
+            throw new InvalidListenerException('Closure needs to have exactly one parameter.');
         }
 
         $class = $parameters[0]->getClass();
         if (!$class) {
-            throw new InvalidListenerException('Closure parameter needs a type-hint on a valid class');
+            throw new InvalidListenerException('Closure parameter needs a type-hint on a valid class.');
         }
 
-
         $this->listeners->attach($handler, $class->getName());
     }
 

diff --git a/src/EventDispatcher.php b/src/EventDispatcher.php
@@ -8,16 +8,16 @@
 
 final class EventDispatcher implements EventDispatcherInterface
 {
-    /**
-     * @var ListenerProviderInterface
-     */
-    private $listenerProvider;
+    private ListenerProviderInterface $listenerProvider;
 
     public function __construct(ListenerProviderInterface $listenerProvider)
     {
         $this->listenerProvider = $listenerProvider;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     public function dispatch(object $event)
     {
         $listeners = $this->listenerProvider->getListenersForEvent($event);