Merge remote-tracking branch 'refs/remotes/origin/1.x' into 1.x

Merge branch '1.1.x' into '1.x'
Updated composer keywords See merge request olive/PHP/map!7
2022-11-30 13:34:57 -08:00 · 2022-05-11 23:44:25 +00:00
2 changed files with 210 additions and 207 deletions
--- a/composer.json
+++ b/composer.json
@ -4,12 +4,12 @@
    "type": "library",
    "keywords": ["map", "hashmap", "hash-map", "data", "data structure", "array", "arrayaccess"],
    "require": {
-        "php": "^8.1",
+        "php": ">=8.1",
        "php-ds/php-ds": "^1.4"
    },
    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.14",
-        "phpunit/phpunit": "^9.6"
+        "friendsofphp/php-cs-fixer": "^3.13",
+        "phpunit/phpunit": "^9.5"
    },
    "license": "MPL-2.0",
    "authors": [
--- a/composer.lock
+++ b/composer.lock
Author	SHA1	Message	Date
R. Eric Wheeler	3ffe6ee387	Merge remote-tracking branch 'refs/remotes/origin/1.x' into 1.x	2022-11-30 13:34:57 -08:00
R. Eric Wheeler	1741825342	Merge branch '1.1.x' into '1.x' Updated composer keywords See merge request olive/PHP/map!7	2022-05-11 23:44:25 +00:00