Merge branch 'master' into add-psr18-http-client-support

simplepie · mblaney · Aug 26, 2023 · Jan 25, 2023 · Jan 26, 2023 · Jan 26, 2023
commit 53d005b11890826047b1f8f0b78d9d5ec14f6752
diff --git a/src/Locator.php b/src/Locator.php
@@ -7,13 +7,15 @@
 
 namespace SimplePie;
 
+use DomDocument;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\UriFactoryInterface;
 use SimplePie\Exception\HttpException;
 use SimplePie\HTTP\Client;
 use SimplePie\HTTP\FileClient;
 use SimplePie\HTTP\Psr18Client;
+use SimplePie\HTTP\Response;
 
 /**
  * Used for feed auto-discovery
@@ -23,8 +25,11 @@
  */
 class Locator implements RegistryAware
 {
+    /** @var ?string */
     public $useragent = null;
+    /** @var int */
     public $timeout = 10;
+    /** @var File */
     public $file;
     /** @var string[] */
     public $local = [];
@@ -56,7 +61,10 @@ class Locator implements RegistryAware
      */
     private $http_client = null;
 
-    public function __construct(File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10, $force_fsockopen = false, $curl_options = [])
+    /**
+     * @param array<int, mixed> $curl_options
+     */
+    public function __construct(File $file, int $timeout = 10, ?string $useragent = null, int $max_checked_feeds = 10, bool $force_fsockopen = false, array $curl_options = [])
     {
         $this->file = $file;
         $this->useragent = $useragent;
@@ -95,7 +103,10 @@ final public function set_http_client(
         $this->http_client = new Psr18Client($http_client, $request_factory, $uri_factory);
     }
 
-    public function set_registry(\SimplePie\Registry $registry)/* : void */
+    /**
+     * @return void
+     */
+    public function set_registry(\SimplePie\Registry $registry)
     {
         $this->registry = $registry;
     }

diff --git a/src/SimplePie.php b/src/SimplePie.php
@@ -24,6 +24,7 @@
 use SimplePie\HTTP\Client;
 use SimplePie\HTTP\FileClient;
 use SimplePie\HTTP\Psr18Client;
+use SimplePie\HTTP\Response;
 
 /**
  * SimplePie