Upgrade symfony/event-dispatcher to ^5.0, ^6.0

CHANGELOG.md

@@ -0,0 +1,16 @@
+# 2.0.0
+
+#### Changes
+
+* Requires PHP >= 7.2
+* Static signature typing to the level of PHP 7.2
+* Nothing else changed
+
+#### New features/improvements
+
+* Works with `symfony/event-dispatcher` `^5.0`, `^6.0`
+* Improved static typing and phpdoc annotations
+
+#### Dev
+
+* Upgraded `phpunit/phpunit`

composer.json

@@ -1,21 +1,24 @@
 {
-    "name": "stil/curl-easy",
-    "description": "cURL wrapper for PHP. Supports parallel and non-blocking requests. For high speed crawling, see stil/curl-robot.",
-    "license": "MIT",
-    "require": {
-        "symfony/event-dispatcher": "^3.2"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^6.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "cURL\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "cURL\\Tests\\": "tests/"
-        }
+  "name": "stil/curl-easy",
+  "version": "2.0.0",
+  "description": "cURL wrapper for PHP. Supports parallel and non-blocking requests. For high speed crawling, see stil/curl-robot.",
+  "license": "MIT",
+  "require": {
+    "symfony/event-dispatcher": "^5.0 || ^6.0",
+    "ext-curl": "*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^9.5",
+    "ext-json": "*"
+  },
+  "autoload": {
+    "psr-4": {
+      "cURL\\": "src/"
     }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "cURL\\Tests\\": "tests/"
+    }
+  }
 }

src/Collection.php

@@ -14,7 +14,7 @@ class Collection
      *
      * @return array
      */
-    public function toArray()
+    public function toArray(): array
     {
         return $this->data;
     }
@@ -26,7 +26,7 @@ public function toArray()
      * @param mixed $value Value
      * @return self
      */
-    public function set($key, $value = null)
+    public function set($key, $value = null): self
     {
         if (is_array($key)) {
             foreach ($key as $k => $v) {
@@ -44,7 +44,7 @@ public function set($key, $value = null)
      * @param mixed $key Key
      * @return bool    TRUE if exists, FALSE otherwise
      */
-    public function has($key)
+    public function has($key): bool
     {
         return isset($this->data[$key]);
     }
@@ -71,7 +71,7 @@ public function get($key)
      * @param mixed $key Key to remove
      * @return self
      */
-    public function remove($key)
+    public function remove($key): self
     {
         unset($this->data[$key]);
         return $this;

src/ConstantsTable.php

@@ -5,14 +5,14 @@
 class ConstantsTable
 {
     /**
-     * @var int[] Array of cURL constants required for intelligent setters
+     * @var array<string,int> Array of cURL constants required for intelligent setters
      */
     protected static $curlConstantsTable = array();
 
     /**
      * @return array
      */
-    public static function loadCurlConstantsTable()
+    public static function loadCurlConstantsTable(): array
     {
         if (empty(self::$curlConstantsTable)) {
             $constants = get_defined_constants(true);
@@ -32,7 +32,7 @@ public static function loadCurlConstantsTable()
      * @return int
      * @throws Exception
      */
-    public static function findNumericValue($const)
+    public static function findNumericValue(string $const): int
     {
         $table = self::loadCurlConstantsTable();
 

src/Event.php

@@ -2,7 +2,7 @@
 
 namespace cURL;
 
-use Symfony\Component\EventDispatcher\Event as SymfonyEvent;
+use Symfony\Contracts\EventDispatcher\Event as SymfonyEvent;
 
 class Event extends SymfonyEvent
 {