php8 support

tests/ZipStreamOpenTest.php

@@ -1,6 +1,13 @@
 <?php
 
-/** @noinspection PhpUsageOfSilenceOperatorInspection */
+declare(strict_types=1);
+
+/*
+ * This file is part of the nelexa/zip package.
+ * (c) Ne-Lexa <https://github.com/Ne-Lexa/php-zip>
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 namespace PhpZip\Tests;
 
@@ -21,25 +28,21 @@ class ZipStreamOpenTest extends TestCase
     /**
      * @dataProvider provideStreams
      *
-     * @param resource    $resource
-     * @param string|null $exceptionClass
-     * @param string|null $exceptionMessage
+     * @param resource $resource
+     * @param ?string  $exceptionClass
+     * @param ?string  $exceptionMessage
      *
      * @throws ZipException
      */
-    public function testOpenStream($resource, $exceptionClass = null, $exceptionMessage = null)
+    public function testOpenStream($resource, ?string $exceptionClass = null, ?string $exceptionMessage = null): void
     {
         if ($resource === null || $resource === false) {
             static::markTestSkipped('skip resource');
-
-            return;
         }
 
         if ($exceptionClass !== null) {
-            $this->expectException(
-                $exceptionClass,
-                $exceptionMessage
-            );
+            $this->expectException($exceptionClass);
+            $this->expectExceptionMessage($exceptionMessage);
         }
 
         static::assertIsResource($resource);
@@ -50,10 +53,7 @@ class ZipStreamOpenTest extends TestCase
         static::assertTrue(fclose($resource));
     }
 
-    /**
-     * @return array
-     */
-    public function provideStreams()
+    public function provideStreams(): array
     {
         return [
             [@fopen(__DIR__ . '/resources/apk.zip', 'rb'), null, null],
@@ -73,11 +73,9 @@ class ZipStreamOpenTest extends TestCase
     }
 
     /**
-     * @param string $filename
-     *
      * @return resource
      */
-    private function getTempResource($filename)
+    private function getTempResource(string $filename)
     {
         $fp = fopen(__DIR__ . '/resources/apk.zip', 'rb');
         $stream = fopen($filename, 'r+b');