add strict types to all properties

kpicaza · kpicaza · commit 1e29ff7729db · 2020-01-06T11:36:48.000+01:00
diff --git a/composer.json b/composer.json
@@ -13,11 +13,11 @@
         }
     ],
     "require": {
-        "php": "^7.2.13",
+        "php": "^7.4.0",
         "psr/event-dispatcher": "^1.0"
     },
     "require-dev": {
-        "phpro/grumphp": "^0.15.0",
+        "phpro/grumphp": "^0.17.1",
         "phpstan/phpstan": "^0.11.5",
         "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^3.4",
@@ -48,7 +48,7 @@
         "sort-packages": true
     },
     "extra": {
-        "zf": {
+        "laminas": {
             "config-provider": "Antidot\\Event\\Container\\Config\\ConfigProvider"
         }
     }
diff --git a/src/Event.php b/src/Event.php
@@ -8,8 +8,7 @@
 
 abstract class Event implements StoppableEventInterface
 {
-    /** @var bool */
-    protected $stopped;
+    protected bool $stopped;
 
     public function isPropagationStopped(): bool
     {
diff --git a/src/EventDispatcher.php b/src/EventDispatcher.php
@@ -10,7 +10,7 @@
 
 class EventDispatcher implements EventDispatcherInterface
 {
-    private $listenerProvider;
+    private ListenerProviderInterface $listenerProvider;
 
     public function __construct(ListenerProviderInterface $listenerProvider)
     {
diff --git a/src/ListenerCollection.php b/src/ListenerCollection.php
@@ -11,7 +11,7 @@
 class ListenerCollection implements IteratorAggregate, ListenerCollectorInterface, ListenerLocatorInterface
 {
     /** @var array<string, array<int, callable>> */
-    private $listeners;
+    private array $listeners;
 
     public function __construct()
     {
diff --git a/src/ListenerProvider.php b/src/ListenerProvider.php
@@ -4,14 +4,13 @@
 
 namespace Antidot\Event;
 
-use function get_class;
 use Psr\EventDispatcher\ListenerProviderInterface;
 use Psr\EventDispatcher\StoppableEventInterface;
+use function get_class;
 
 class ListenerProvider implements ListenerProviderInterface, ListenerCollectorInterface
 {
-    /** @var ListenerCollection */
-    private $listenerCollection;
+    private ListenerCollection $listenerCollection;
 
     public function __construct()
     {
diff --git a/test/Container/TestEvent.php b/test/Container/TestEvent.php
@@ -8,5 +8,5 @@
 
 class TestEvent extends Event
 {
-    protected $stopped = false;
+    protected bool $stopped = false;
 }

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`
`9`	`9`	`abstract class Event implements StoppableEventInterface`
`10`	`10`	`{`
`11`		`- /** @var bool */`
`12`		`- protected $stopped;`
	`11`	`+ protected bool $stopped;`
`13`	`12`
`14`	`13`	`public function isPropagationStopped(): bool`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`class EventDispatcher implements EventDispatcherInterface`
`12`	`12`	`{`
`13`		`- private $listenerProvider;`
	`13`	`+ private ListenerProviderInterface $listenerProvider;`
`14`	`14`
`15`	`15`	`public function __construct(ListenerProviderInterface $listenerProvider)`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`class ListenerCollection implements IteratorAggregate, ListenerCollectorInterface, ListenerLocatorInterface`
`12`	`12`	`{`
`13`	`13`	`/** @var array<string, array<int, callable>> */`
`14`		`- private $listeners;`
	`14`	`+ private array $listeners;`
`15`	`15`
`16`	`16`	`public function __construct()`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,13 @@`
`4`	`4`
`5`	`5`	`namespace Antidot\Event;`
`6`	`6`
`7`		`-use function get_class;`
`8`	`7`	`use Psr\EventDispatcher\ListenerProviderInterface;`
`9`	`8`	`use Psr\EventDispatcher\StoppableEventInterface;`
	`9`	`+use function get_class;`
`10`	`10`
`11`	`11`	`class ListenerProvider implements ListenerProviderInterface, ListenerCollectorInterface`
`12`	`12`	`{`
`13`		`- /** @var ListenerCollection */`
`14`		`- private $listenerCollection;`
	`13`	`+ private ListenerCollection $listenerCollection;`
`15`	`14`
`16`	`15`	`public function __construct()`
`17`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`
`9`	`9`	`class TestEvent extends Event`
`10`	`10`	`{`
`11`		`- protected $stopped = false;`
	`11`	`+ protected bool $stopped = false;`
`12`	`12`	`}`