Merge pull request #106 from pamil/4.x-idntoasciideprecated

Workaround deprecated variant in `idn_to_*` functions & PHP 7.2 support

.travis.yml

@@ -12,6 +12,8 @@ matrix:
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
     - php: 7.1
       env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
+    - php: 7.2
+      env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
     - php: hhvm
       env: COLLECT_COVERAGE=false VALIDATE_CODING_STYLE=false
   fast_finish: true

composer.json

@@ -20,7 +20,7 @@
         "ext-mbstring" : "*",
         "ext-intl" : "*",
         "ext-fileinfo": "*",
-        "jeremykendall/php-domain-parser": "^3.0",
+        "jeremykendall/php-domain-parser": "4.0.3-alpha",
         "php" : ">=5.5.9",
         "psr/http-message": "^1.0"
     },

src/Components/Host.php

@@ -266,7 +266,15 @@ public function getLabels()
     public function getLabel($offset, $default = null)
     {
         if (isset($this->data[$offset])) {
-            return $this->isIdn ? rawurldecode($this->data[$offset]) : idn_to_ascii($this->data[$offset]);
+            if ($this->isIdn) {
+                return rawurldecode($this->data[$offset]);
+            }
+
+            if (PHP_VERSION_ID >= 70200) {
+                return @idn_to_ascii($this->data[$offset]);
+            }
+
+            return idn_to_ascii($this->data[$offset]);
         }
 
         return $default;

src/Components/HostnameTrait.php

@@ -45,7 +45,7 @@ protected function convertToAscii(array $labels, $convert)
 
         foreach ($labels as &$label) {
             if ('' !== $label) {
-                $label = idn_to_ascii($label);
+                $label = PHP_VERSION_ID >= 70200 ? @idn_to_ascii($label) : idn_to_ascii($label);
             }
         }
         unset($label);
@@ -65,14 +65,14 @@ protected function validateStringHost($str)
         $host = $this->lower($this->setIsAbsolute($str));
         $raw_labels = explode('.', $host);
         $labels = array_map(function ($value) {
-            return idn_to_ascii($value);
+            return PHP_VERSION_ID >= 70200 ? @idn_to_ascii($value) : idn_to_ascii($value);
         }, $raw_labels);
 
         $this->assertValidHost($labels);
         $this->isIdn = $raw_labels !== $labels;
 
         return array_reverse(array_map(function ($label) {
-            return idn_to_utf8($label);
+            return PHP_VERSION_ID >= 70200 ? @idn_to_utf8($label) : idn_to_utf8($label);
         }, $labels));
     }
 

test/Components/DataPathTest.php

@@ -46,15 +46,15 @@ public function testWithPath()
     public function testCreateFromPath($path, $expected)
     {
         $uri = Path::createFromPath(dirname(__DIR__).'/data/'.$path);
-        $this->assertSame($expected, $uri->getMimeType());
+        $this->assertContains($uri->getMimeType(), $expected);
     }
 
     public function validFilePath()
     {
         return [
-            'text file' => ['hello-world.txt', 'text/plain'],
-            'img file' => ['red-nose.gif', 'image/gif'],
-            'vcard file' => ['john-doe.vcf', 'text/x-vcard'],
+            'text file' => ['hello-world.txt', ['text/plain']],
+            'img file' => ['red-nose.gif', ['image/gif']],
+            'vcard file' => ['john-doe.vcf', ['text/x-vcard', 'text/vcard']],
         ];
     }