Merge pull request #170 from maxmind/greg/fix-ext-maxminddb-conflict

Fix conflict directive for ext-maxminddb

Author: faktas2

.github/workflows/lint.yml

@@ -22,6 +22,9 @@ jobs:
       - name: Install dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
+      - name: Validate composer.json
+        run: composer validate
+
       - name: Lint with php-cs-fixer
         run: vendor/bin/php-cs-fixer fix --verbose --diff --dry-run
 

composer.json

@@ -21,7 +21,7 @@
         "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups"
     },
     "conflict": {
-        "ext-maxminddb": "<1.11.1,>=2.0.0"
+        "ext-maxminddb": "<1.11.1 || >=2.0.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "3.*",