Merge pull request #186 from thephpleague/feature/move-idna-classes

Use the classes defined in the uri-interface package

.github/workflows/build.yml

@@ -5,24 +5,39 @@ on:
     pull_request: ~
 
 jobs:
-    phpunit:
-        name: PHPUnit tests on ${{ matrix.php }} ${{ matrix.composer-flags }}
-        runs-on: ubuntu-18.04
+    linux_tests:
+        name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
+        runs-on: ubuntu-20.04
         strategy:
             matrix:
                 php: ['7.3', '7.4', '8.0']
-                composer-flags: [ '' ]
+                stability: [prefer-lowest, prefer-stable]
+                include:
+                    -   php: '8.1'
+                        flags: "--ignore-platform-req=php"
+                        stability: prefer-stable
                 phpunit-flags: [ '--coverage-text' ]
         steps:
-            - uses: actions/checkout@v2
-            - uses: shivammathur/setup-php@v2
+            - name: Checkout code
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
                   coverage: xdebug
                   tools: composer:v2
-            - run: composer update --no-progress ${{ matrix.composer-flags }}
-            - run: composer phpunit
-            - run: composer phpstan
+
+            - name: Install dependencies
+              run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }}
+
+            - name: Run Unit tests
+              run: composer phpunit
+
+            - name: Run static analysis
+              run: composer phpstan
               if: ${{ matrix.php == '8.0' }}
-            - run: composer phpcs
+
+            - name: Run coding style check
+              run: composer phpcs
               if: ${{ matrix.php == '8.0' }}

CHANGELOG.md

@@ -7,10 +7,11 @@ All Notable changes to `League\Uri` will be documented in this file
 ### Added
 
 - `Uri::toString` a class that implements PSR-17 UriFactoryInterface. The package needs to be present for the class to work.
+- `IDNA` conversion in now normalize using the `Uri-Interface` package classes
 
 ### Fixed
 
-- None
+- conversion host component from ASCII to unicode no longer throw
 
 ### Deprecated
 

composer.json

@@ -47,14 +47,14 @@
         "php": "^7.3 || ^8.0",
         "ext-json": "*",
         "psr/http-message": "^1.0",
-        "league/uri-interfaces": "^2.1"
+        "league/uri-interfaces": "^2.3"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^2.19",
         "phpunit/phpunit" : "^8.0 || ^9.0",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-strict-rules": "^0.12",
-        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan": "^0.12.90",
+        "phpstan/phpstan-strict-rules": "^0.12.9",
+        "phpstan/phpstan-phpunit": "^0.12.20",
         "psr/http-factory": "^1.0"
     },
     "autoload": {