Replace idna_convert.class.php with Algo26\IdnaConvert, allow custom idna library

.github/workflows/ci.yml

@@ -72,6 +72,11 @@ jobs:
           coverage: none
           tools: none
 
+      # Install dependencies and handle caching in one go.
+      # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
+      - name: "Install Composer dependencies"
+        uses: "ramsey/composer-install@v2"
+
       - name: "Install idna-convert v3"
         if: ${{ matrix.with == 'idna-convert-v3' }}
         run: "composer require --dev algo26-matthias/idna-convert:^3"
@@ -80,11 +85,6 @@ jobs:
         if: ${{ matrix.with == 'idna-convert-v2' }}
         run: "composer require --dev algo26-matthias/idna-convert:^2"
 
-      # Install dependencies and handle caching in one go.
-      # @link https://github.com/marketplace/actions/install-php-dependencies-with-composer
-      - name: "Install Composer dependencies"
-        uses: "ramsey/composer-install@v2"
-
       - name: Run unit tests
         run: composer test
 

src/Enclosure.php

@@ -45,6 +45,8 @@
 
 namespace SimplePie;
 
+use SimplePie\Idna\IdnaDomainFilter;
+
 /**
  * Handles everything related to enclosures (including Media RSS and iTunes RSS)
  *
@@ -55,7 +57,7 @@
  * @package SimplePie
  * @subpackage API
  */
-class Enclosure
+class Enclosure implements RegistryAware
 {
     /**
      * @var string
@@ -226,6 +228,7 @@ class Enclosure
      * properties and their accessors
      *
      * @uses idna_convert If available, this will convert an IDN
+     * @see https://github.com/algo26-matthias/idna-convert
      */
     public function __construct($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
     {
@@ -255,12 +258,32 @@ public function __construct($link = null, $type = null, $length = null, $javascr
         $this->type = $type;
         $this->width = $width;
 
-        if (class_exists('idna_convert')) {
-            $idn = new \idna_convert();
-            $parsed = \SimplePie\Misc::parse_url($link);
-            $this->link = \SimplePie\Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+        // Needs to load last
+        $this->handler = $this->get_handler();
+    }
+
+    /**
+     * Set the Registry into the class
+     *
+     * @param Registry $registry
+     *
+     * @return void
+     */
+    public function set_registry(Registry $registry): void
+    {
+        $idnaConverter = $registry->create(IdnaDomainFilter::class);
+        $parsed = $registry->call(Misc::class, 'parse_url', [$this->link]);
+        $authority = $idnaConverter->filter($parsed['authority']);
+
+        if ($authority !== $parsed['authority']) {
+            $this->link = $registry->call(Misc::class, 'compress_parse_url', [
+                $parsed['scheme'],
+                $authority,
+                $parsed['path'],
+                $parsed['query'],
+                $parsed['fragment'],
+            ]);
         }
-        $this->handler = $this->get_handler(); // Needs to load last
     }
 
     /**

src/Registry.php

@@ -46,6 +46,8 @@
 namespace SimplePie;
 
 use SimplePie\Content\Type\Sniffer;
+use SimplePie\Idna\IdnaConverter;
+use SimplePie\Idna\IdnaDomainFilter;
 use SimplePie\Parse\Date;
 use SimplePie\XML\Declaration\Parser as DeclarationParser;
 
@@ -85,6 +87,7 @@ class Registry
         Misc::class => Misc::class,
         DeclarationParser::class => DeclarationParser::class,
         Date::class => Date::class,
+        IdnaDomainFilter::class => IdnaConverter::class,
     ];
 
     /**