Declare strict_types=1 in every file (#763)

* declare strict_types=1 in every file * declare strict_types=1 in IRI and Parse Date class * declare strict_types=1 in Misc class, fix bug * declare strict_types=1 in SimplePie class * BC for PHP < 8.0 * Strip declare statement in compiled file * Fix many errors for PHPStan Level 1 * do not round() int * Fix get_image_height() and get_image_width() returning int|null Returning float instead of int was wrongly introduced in commt 33a8f76 According to the RSS 2.0 spec height and width must be the number of pixels. see https://www.rssboard.org/rss-specification#ltimagegtSubelementOfLtchannelgt * Update CHANGELOG.md * clarify some statements * Fix $encoded declatation * Fix $valid declaration * fix CS by running php-cs-fixer
simplepie · Dec 13, 2022 · efe70f4 · efe70f4
1 parent 93fe459
commit efe70f4
Show file tree

Hide file tree

Showing 131 changed files with 336 additions and 35 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -12,7 +12,6 @@
         '@PSR12' => true,
         '@PHP71Migration' => true,
         '@PHP71Migration:risky' => true,
-        'declare_strict_types' => false,
         'void_return' => false,
         '@PHPUnit84Migration:risky' => true,
     ])

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - The class `SimplePie\Cache\Redis` is deprecated, use implementation of `Psr\SimpleCache\CacheInterface` instead
 - The interface `SimplePie\Cache\Base` is deprecated, use interface `Psr\SimpleCache\CacheInterface` instead
 
+### Fixed
+
+- The method `SimplePie\SimplePie::get_image_height()` returns the pixel number as `int` instead of `float`
+- The method `SimplePie\SimplePie::get_image_width()` returns the pixel number as `int` instead of `float`
+
 ## [1.7.0](https://github.com/simplepie/simplepie/compare/1.6.0...1.7.0) - 2022-09-30
 
 ### Added

diff --git a/build/bootstrap.php b/build/bootstrap.php
@@ -1,4 +1,6 @@
 <?php
 
+declare(strict_types=1);
+
 require_once dirname(__DIR__) . '/SimplePie.compiled.php';
 require_once dirname(__DIR__) . '/vendor/yoast/phpunit-polyfills/phpunitpolyfills-autoload.php';
diff --git a/build/charset.php b/build/charset.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 require_once '../autoloader.php';
 
 function normalize_character_set($charset)

diff --git a/build/compile.php b/build/compile.php
@@ -1,18 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 // Set up our constants
 define('SP_PATH', dirname(__FILE__, 2));
 define('COMPILED', SP_PATH . DIRECTORY_SEPARATOR . 'SimplePie.compiled.php');
 
 if (! function_exists('str_starts_with')) {
-    function str_starts_with(string $haystack, string $needle)
+    function str_starts_with(string $haystack, string $needle): bool
     {
         return strncmp($haystack, $needle, strlen($needle)) === 0;
     }
 }
 
 if (! function_exists('str_ends_with')) {
-    function str_ends_with(string $haystack, string $needle)
+    function str_ends_with(string $haystack, string $needle): bool
     {
         return $needle === '' || $needle === substr($haystack, - strlen($needle));
     }
@@ -24,8 +26,18 @@ function remove_header($contents)
     $stripped_source = '';
     $stripped_doc = false;
     $stripped_open = false;
+    $stripped_declare = false;
+    $in_declare_strip = false;
+
     foreach ($tokens as $value) {
         if (is_string($value)) {
+            if ($in_declare_strip) {
+                if ($value === ';') {
+                    $in_declare_strip = false;
+                    $stripped_declare = true;
+                }
+                continue;
+            }
             $stripped_source .= "{$value}";
             continue;
         }
@@ -36,6 +48,22 @@ function remove_header($contents)
                     continue 2;
                 }
                 break;
+            case T_STRING:
+                if ($in_declare_strip) {
+                    continue 2;
+                }
+                break;
+            case T_LNUMBER:
+                if ($in_declare_strip) {
+                    continue 2;
+                }
+                break;
+            case T_DECLARE:
+                if (! $stripped_declare && ! $in_declare_strip) {
+                    $in_declare_strip = true;
+                    continue 2;
+                }
+                break;
             case T_OPEN_TAG:
                 if (!$stripped_open) {
                     $stripped_open = true;

diff --git a/library/SimplePie.php b/library/SimplePie.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Author.php b/library/SimplePie/Author.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache.php b/library/SimplePie/Cache.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache/Base.php b/library/SimplePie/Cache/Base.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache/DB.php b/library/SimplePie/Cache/DB.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache/File.php b/library/SimplePie/Cache/File.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache/Memcache.php b/library/SimplePie/Cache/Memcache.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache/Memcached.php b/library/SimplePie/Cache/Memcached.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache/MySQL.php b/library/SimplePie/Cache/MySQL.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Cache/Redis.php b/library/SimplePie/Cache/Redis.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 /**
  * SimplePie Redis Cache Extension
  *

diff --git a/library/SimplePie/Caption.php b/library/SimplePie/Caption.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Category.php b/library/SimplePie/Category.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Content/Type/Sniffer.php b/library/SimplePie/Content/Type/Sniffer.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Copyright.php b/library/SimplePie/Copyright.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Core.php b/library/SimplePie/Core.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Credit.php b/library/SimplePie/Credit.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Decode/HTML/Entities.php b/library/SimplePie/Decode/HTML/Entities.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Enclosure.php b/library/SimplePie/Enclosure.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Exception.php b/library/SimplePie/Exception.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/File.php b/library/SimplePie/File.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/HTTP/Parser.php b/library/SimplePie/HTTP/Parser.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/IRI.php b/library/SimplePie/IRI.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Item.php b/library/SimplePie/Item.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Locator.php b/library/SimplePie/Locator.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Misc.php b/library/SimplePie/Misc.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Net/IPv6.php b/library/SimplePie/Net/IPv6.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Parse/Date.php b/library/SimplePie/Parse/Date.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Parser.php b/library/SimplePie/Parser.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Rating.php b/library/SimplePie/Rating.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Registry.php b/library/SimplePie/Registry.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Restriction.php b/library/SimplePie/Restriction.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Sanitize.php b/library/SimplePie/Sanitize.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/Source.php b/library/SimplePie/Source.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/XML/Declaration/Parser.php b/library/SimplePie/XML/Declaration/Parser.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/library/SimplePie/gzdecode.php b/library/SimplePie/gzdecode.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/src/Author.php b/src/Author.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/src/Cache.php b/src/Cache.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/src/Cache/Base.php b/src/Cache/Base.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/src/Cache/BaseDataCache.php b/src/Cache/BaseDataCache.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/src/Cache/DB.php b/src/Cache/DB.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/src/Cache/DataCache.php b/src/Cache/DataCache.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *

diff --git a/src/Cache/File.php b/src/Cache/File.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * SimplePie
  *