support PHP 8.5, drop support for PHP 8.1

Author: jiripudil

.github/workflows/main.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ '8.1', '8.2', '8.3', '8.4' ]
+        php: [ '8.2', '8.3', '8.4', '8.5' ]
         latte: [ '', '--prefer-lowest' ]
         exclude:
-          - php: '8.4'
+          - php: '8.5'
             latte: '--prefer-lowest'
       fail-fast: false
     steps:
@@ -38,7 +38,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           extensions: curl, iconv, json, mbstring, tokenizer
           coverage: pcov
       - run: composer install --no-interaction
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           coverage: none
       - run: composer install --no-interaction
       - run: make phpstan
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.4'
+          php-version: '8.5'
           coverage: none
       - run: composer install --no-interaction
       - run: make cs

composer.json

@@ -20,7 +20,7 @@
     "issues": "https://github.com/contributte/webpack/issues"
   },
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "ext-curl": "*",
     "nette/di": "^3.0"
   },

src/DevServer/Http/CurlClient.php

@@ -23,17 +23,20 @@ public function isAvailable(string $url, float $timeout): bool
 			return false;
 		}
 
+		$output = \fopen('php://temp', 'w+');
+		\assert($output !== false);
+
 		\curl_setopt_array($curl, [
 			\CURLOPT_CUSTOMREQUEST => 'GET',
 			\CURLOPT_PROTOCOLS => \CURLPROTO_HTTP | \CURLPROTO_HTTPS,
 
 			// no output please
 			\CURLOPT_RETURNTRANSFER => false,
 			\CURLOPT_HEADER => false,
-			\CURLOPT_FILE => \fopen('php://temp', 'w+'),
+			\CURLOPT_FILE => $output,
 
 			// setup timeout; this requires NOSIGNAL for values below 1s
-			\CURLOPT_TIMEOUT_MS => $timeout * 1000,
+			\CURLOPT_TIMEOUT_MS => (int) $timeout * 1000,
 			\CURLOPT_NOSIGNAL => $timeout < 1 && \PHP_OS_FAMILY !== 'Windows',
 
 			// allow self-signed certificates
@@ -44,7 +47,6 @@ public function isAvailable(string $url, float $timeout): bool
 		\curl_exec($curl);
 		$error = \curl_error($curl);
 
-		\curl_close($curl);
 		return $error === '';
 	}
 }

src/Manifest/ManifestLoader.php

@@ -42,7 +42,7 @@ public function loadManifest(string $fileName): array
 					\CURLOPT_FAILONERROR => true,
 
 					// setup timeout; this requires NOSIGNAL for values below 1s
-					\CURLOPT_TIMEOUT_MS => $this->timeout * 1000,
+					\CURLOPT_TIMEOUT_MS => (int) $this->timeout * 1000,
 					\CURLOPT_NOSIGNAL => $this->timeout < 1 && \PHP_OS_FAMILY !== 'Windows',
 
 					// allow self-signed certificates
@@ -55,8 +55,6 @@ public function loadManifest(string $fileName): array
 				if ($manifest === false) {
 					$errorMessage = \curl_error($ch);
 				}
-
-				\curl_close($ch);
 			}
 		}
 

tests/DI/WebpackExtensionTest.phpt

@@ -99,7 +99,6 @@ final class WebpackExtensionTest extends TestCase
 
 		$refl = new \ReflectionClass($resolver);
 		$cache = $refl->getProperty('resolutions');
-		$cache->setAccessible(true);
 
 		Assert::same(['asset.js' => 'cached.resolved.asset.js'], $cache->getValue($resolver));
 	}