drop PHP 7.4 and 8.0, bump PHPStan to 2

.github/workflows/tests.yml

@@ -17,12 +17,11 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.4"
-          - "8.0"
           - "8.1"
           - "8.2"
           - "8.3"
           - "8.4"
+          - "8.5"
 
     steps:
 

CHANGELOG.md

@@ -1,8 +1,12 @@
 # CHANGELOG
 
-## 0.9.21 - 2024-xx-xx
+**NOTE**: since version 0.10, this CHANGELOG is no longer updated. Check the
+[release notes](https://github.com/FileEye/pel/releases) of each release instead.
 
-* [CI] Run PHPStan at rule level 0
+## 0.10.0 - 2024-01-11
+
+* [CI] Run PHPStan at rule level 5
+* Add Codecov
 * Removed support for PHP lower than 7.4
 
 ## 0.9.20 - 2023-06-20

composer.json

@@ -21,16 +21,16 @@
 	],
 	"license" : "GPL-2.0",
 	"require" : {
-		"php" : ">=7.4"
+		"php" : ">=8.1"
 	},
 	"require-dev" : {
 		"ext-gd" : "*",
 		"ext-exif" : "*",
 		"squizlabs/php_codesniffer" : ">=3.8",
-		"phpunit/phpunit" : "^9 || ^10 || ^11 ",
-		"phpstan/extension-installer": "^1.1",
-		"phpstan/phpstan": "^1.10",
-		"phpstan/phpstan-phpunit": "^1.3.11"
+		"phpunit/phpunit" : "^10 || ^11 ",
+		"phpstan/extension-installer": "^1.4",
+		"phpstan/phpstan": "^2",
+		"phpstan/phpstan-phpunit": "^2"
 	},
     "config": {
         "allow-plugins": {

phpstan.neon.dist

@@ -6,6 +6,8 @@ parameters:
     - src
     - test
 
+  treatPhpDocTypesAsCertain: false
+
   ignoreErrors:
     -
        message: "#^Unreachable statement - code above always terminates.$#"

src/PelDataWindow.php

@@ -97,7 +97,7 @@ public function __construct($data = '', $endianess = PelConvert::LITTLE_ENDIAN)
     {
         if (is_string($data)) {
             $this->data = $data;
-        } elseif ((is_resource($data) && get_resource_type($data) === 'gd') || (PHP_VERSION_ID >= 80000 && is_object($data) && $data instanceof \GDImage)) {
+        } elseif (is_object($data) && $data instanceof \GDImage) {
             /*
              * The ImageJpeg() function insists on printing the bytes
              * instead of returning them in a more civil way as a string, so

src/PelJpeg.php

@@ -122,7 +122,7 @@ public function __construct($data = false)
             } elseif ($data instanceof PelDataWindow) {
                 Pel::debug('Initializing PelJpeg object from PelDataWindow.');
                 $this->load($data);
-            } elseif ((is_resource($data) && get_resource_type($data) == 'gd') || (PHP_VERSION_ID >= 80000 && is_object($data) && $data instanceof \GDImage)) {
+            } elseif (is_object($data) && $data instanceof \GDImage) {
                 Pel::debug('Initializing PelJpeg object from image resource.');
                 $this->load(new PelDataWindow($data));
             } else {

test/BrokenImagesTest.php

@@ -33,25 +33,25 @@ class BrokenImagesTest extends TestCase
     public function testWindowWindowExceptionIsCaught()
     {
         $jpeg = new PelJpeg(dirname(__FILE__) . '/broken_images/gh-10-a.jpg');
-        $this->assertInstanceOf('\lsolesen\pel\PelJpeg', $jpeg);
+        $this->assertNotSame('', $jpeg->getBytes());
     }
 
     public function testWindowOffsetExceptionIsCaught()
     {
         $jpeg = new PelJpeg(dirname(__FILE__) . '/broken_images/gh-10-b.jpg');
-        $this->assertInstanceOf('\lsolesen\pel\PelJpeg', $jpeg);
+        $this->assertNotSame('', $jpeg->getBytes());
     }
 
     public function testParsingNotFailingOnRecursingIfd()
     {
         $jpeg = new PelJpeg(dirname(__FILE__) . '/broken_images/gh-11.jpg');
-        $this->assertInstanceOf('\lsolesen\pel\PelJpeg', $jpeg);
+        $this->assertNotSame('', $jpeg->getBytes());
     }
 
     public function testInvalidIfd()
     {
         $this->expectException(PelIllegalFormatException::class) ;
         $jpeg = new PelJpeg(dirname(__FILE__) . '/broken_images/gh-156.jpg');
-        $this->assertInstanceOf('\lsolesen\pel\PelJpeg', $jpeg);
+        $this->assertNotSame('', $jpeg->getBytes());
     }
 }

test/Bug3017880Test.php

@@ -42,7 +42,7 @@ public function testThisDoesNotWorkAsExpected()
         try {
             $resave_file = 0;
             $jpeg = new PelJpeg($filename);
-            $this->assertInstanceOf('\lsolesen\pel\PelJpeg', $jpeg);
+            $this->assertNotSame('', $jpeg->getBytes());
 
             // should all exif data on photo be cleared (gd and iu will always strip it anyway, so only
             // force strip if you know the image you're branding is an original)

test/Gh200Test.php

@@ -43,7 +43,7 @@ public function testPelDataWindowOffsetExceptionOffsetNotWithin()
 
         $data = new PelDataWindow(file_get_contents($file));
         $pelJpeg = new PelJpeg($data);
-        
-        $this->assertInstanceOf('\lsolesen\pel\PelJpeg', $pelJpeg);
+
+        $this->assertNotSame('', $pelJpeg->getBytes());
     }
 }