Merge branch 'master' into fix-http-trailer-headers

Author: Alkarex

.editorconfig

@@ -19,6 +19,10 @@ indent_style = space
 max_line_length = off
 trim_trailing_whitespace = false
 
+[*.neon]
+indent_size = 4
+indent_style = space
+
 [*.php]
 indent_size = 4
 indent_style = space

.gitattributes

@@ -4,9 +4,12 @@
 /compatibility_test export-ignore
 /demo export-ignore
 /tests export-ignore
+/utils/PHPStan export-ignore
 .gitattributes export-ignore
 .editorconfig export-ignore
 .gitignore export-ignore
 ROADMAP.md export-ignore
 phpunit.xml.dist export-ignore
 .php-cs-fixer.dist.php export-ignore
+db.sql export-ignore
+phpstan.dist.neon export-ignore

.gitignore

@@ -7,3 +7,4 @@ phpstan.neon
 phpunit.xml
 .php-cs-fixer.cache
 .phpunit.cache/
+.phpunit.result.cache

autoloader.php

@@ -57,6 +57,7 @@
  */
 class SimplePie_Autoloader
 {
+	/** @var string */
 	protected $path;
 
 	/**
@@ -72,7 +73,7 @@ public function __construct()
 	 *
 	 * @param string $class The name of the class to attempt to load.
 	 */
-	public function autoload($class)
+	public function autoload(string $class): void
 	{
 		// Only load the class if it starts with "SimplePie"
 		if (strpos($class, 'SimplePie') !== 0)

demo/test.php

@@ -37,7 +37,7 @@
 }
 
 // Output buffer
-function callable_htmlspecialchars($string)
+function callable_htmlspecialchars(string $string): string
 {
     return htmlspecialchars($string);
 }

library/SimplePie/Decode/HTML/Entities.php

@@ -72,6 +72,7 @@ public function parse()
      *
      * @access private
      * @return string|false The next byte, or false, if there is no more data
+     * @phpstan-impure
      */
     public function consume()
     {
@@ -547,6 +548,7 @@ public function entity()
                     'zwnj;' => "\xE2\x80\x8C"
                 ];
 
+                $consumed = '';
                 for ($i = 0, $match = null; $i < 9 && $this->consume() !== false; $i++) {
                     // Cast for PHPStan on PHP < 8.0: We consumed as per the loop condition,
                     // so `$this->consumed` is non-empty and the substr offset is valid.

phpstan.dist.neon

@@ -5,6 +5,7 @@ parameters:
         - library/
         - src/
         - tests/
+        - utils/
 
     ignoreErrors:
         # Ignore that only one const exists atm

src/File.php

@@ -121,12 +121,15 @@ public function __construct(string $url, int $timeout = 10, int $redirects = 5,
                     }
                     unset($curl_options[CURLOPT_HTTPHEADER]);
                 }
-                if (version_compare(\SimplePie\Misc::get_curl_version(), '7.10.5', '>=')) {
+                if (version_compare(\SimplePie\Misc::get_curl_version(), '7.21.6', '>=')) {
+                    curl_setopt($fp, CURLOPT_ACCEPT_ENCODING, '');
+                } else {
                     curl_setopt($fp, CURLOPT_ENCODING, '');
                 }
+                /** @var non-empty-string $url */
                 curl_setopt($fp, CURLOPT_URL, $url);
-                curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($fp, CURLOPT_FAILONERROR, 1);
+                curl_setopt($fp, CURLOPT_RETURNTRANSFER, true);
+                curl_setopt($fp, CURLOPT_FAILONERROR, true);
                 curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
                 curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
                 curl_setopt($fp, CURLOPT_REFERER, \SimplePie\Misc::url_remove_credentials($url));
@@ -144,7 +147,11 @@ public function __construct(string $url, int $timeout = 10, int $redirects = 5,
                 $responseBody = curl_exec($fp);
                 $responseHeaders .= "\r\n";
                 if (curl_errno($fp) === CURLE_WRITE_ERROR || curl_errno($fp) === CURLE_BAD_CONTENT_ENCODING) {
-                    curl_setopt($fp, CURLOPT_ENCODING, 'none');
+                    if (version_compare(\SimplePie\Misc::get_curl_version(), '7.21.6', '>=')) {
+                        curl_setopt($fp, CURLOPT_ACCEPT_ENCODING, 'none');
+                    } else {
+                        curl_setopt($fp, CURLOPT_ENCODING, 'none');
+                    }
                     $responseHeaders = '';
                     $responseBody = curl_exec($fp);
                     $responseHeaders .= "\r\n";

src/HTTP/Parser.php

@@ -243,7 +243,7 @@ private function add_header(string $name, string $value): void
             $headers[$name][] = $value;
         } else {
             // For PHPStan: should be enforced by template parameter but PHPStan is not smart enough.
-            /** @var array<string, string>) */
+            /** @var array<string,string> */
             $headers = &$this->headers;
             $headers[$name] .= ', ' . $value;
         }
@@ -258,7 +258,7 @@ private function replace_header(string $name, string $value): void
             $headers[$name] = [$value];
         } else {
             // For PHPStan: should be enforced by template parameter but PHPStan is not smart enough.
-            /** @var array<string, string>) */
+            /** @var array<string,string> */
             $headers = &$this->headers;
             $headers[$name] = $value;
         }

src/Item.php

@@ -672,7 +672,7 @@ public function get_date(string $date_format = 'j F Y, g:i a')
                     return $this->data['date']['parsed'];
 
                 default:
-                    return date($date_format, $this->data['date']['parsed']);
+                    return $this->data['date']['parsed'] !== null ? date($date_format, $this->data['date']['parsed']) : null;
             }
         }