Drop PHP 7.4 support (#39)

simPod · web-flow · commit 8dfe66d8cc88 · 2022-02-10T11:07:06.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-20.04
         strategy:
             matrix:
-                php-version: [7.4]
+                php-version: [8.0]
         steps:
             -   uses: actions/checkout@v2
             -   uses: shivammathur/setup-php@v2
@@ -40,7 +40,7 @@ jobs:
         runs-on: ubuntu-20.04
         strategy:
             matrix:
-                php-version: [7.4]
+                php-version: [8.0]
         steps:
             -   uses: actions/checkout@v2
             -   uses: shivammathur/setup-php@v2
@@ -70,7 +70,7 @@ jobs:
         runs-on: ubuntu-20.04
         strategy:
             matrix:
-                php-version: [7.4, 8.0]
+                php-version: [8.0]
                 dependencies: ["", --prefer-lowest]
 
         steps:
@@ -105,7 +105,7 @@ jobs:
         runs-on: ubuntu-20.04
         strategy:
             matrix:
-                php-version: [7.4]
+                php-version: [8.0]
 
         steps:
             -   uses: actions/checkout@v2
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "psr/log": "^1.1 || ^2 || ^3"
     },
     "suggest": {
@@ -43,7 +43,7 @@
         "psr/http-message": "^1.0",
         "simpod/php-coveralls-mirror": "^3.0",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/process": "^5.0 || ^6.0",
+        "symfony/process": "^6.0",
         "thecodingmachine/phpstan-safe-rule": "^1.0"
     },
     "autoload": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -9,7 +9,7 @@
     <!-- Ignore warnings, show progress of the run and show sniff names -->
     <arg value="nps" />
 
-    <config name="php_version" value="70400" />
+    <config name="php_version" value="80000" />
 
     <file>src</file>
     <file>tests</file>
diff --git a/src/Exception/EndOfMibReached.php b/src/Exception/EndOfMibReached.php
@@ -10,7 +10,7 @@
 
 final class EndOfMibReached extends RequestException
 {
-    public static function new(?Throwable $previous = null): self
+    public static function new(Throwable|null $previous = null): self
     {
         return new self('No more variables left in this MIB View (It is past the end of the MIB tree)', 0, $previous);
     }
diff --git a/src/Exception/GeneralException.php b/src/Exception/GeneralException.php
@@ -12,16 +12,16 @@
 // phpcs:ignore SlevomatCodingStandard.Classes.SuperfluousExceptionNaming.SuperfluousSuffix
 final class GeneralException extends RuntimeException implements SnmpException
 {
-    public ?string $host = null;
+    public string|null $host = null;
 
-    public ?string $oids = null;
+    public string|null $oids = null;
 
     /** @param list<string> $oids */
     public static function new(
         string $error,
-        ?Throwable $previous = null,
-        ?string $host = null,
-        ?array $oids = null
+        Throwable|null $previous = null,
+        string|null $host = null,
+        array|null $oids = null,
     ): self {
         $self = new self($error, 0, $previous);
         $self->host = $host;
@@ -33,7 +33,7 @@ public static function new(
     }
 
     /** @param list<string> $oids */
-    public static function fromThrowable(Throwable $throwable, ?string $host = null, ?array $oids = null): self
+    public static function fromThrowable(Throwable $throwable, string|null $host = null, array|null $oids = null): self
     {
         return self::new($throwable->getMessage(), $throwable, $host, $oids);
     }
diff --git a/src/Exception/NoSuchInstanceExists.php b/src/Exception/NoSuchInstanceExists.php
@@ -33,7 +33,7 @@ public static function fromThrowable(string $host, Throwable $throwable): self
         return $self;
     }
 
-    private static function new(?Throwable $previous = null): self
+    private static function new(Throwable|null $previous = null): self
     {
         return new self('No Such Instance currently exists at this OID', 0, $previous);
     }
diff --git a/src/Exception/NoSuchObjectExists.php b/src/Exception/NoSuchObjectExists.php
@@ -33,7 +33,7 @@ public static function fromThrowable(string $host, Throwable $throwable): self
         return $self;
     }
 
-    private static function new(?Throwable $previous = null): self
+    private static function new(Throwable|null $previous = null): self
     {
         return new self('No Such Object available on this agent at this OID', 0, $previous);
     }
diff --git a/src/Exception/RequestException.php b/src/Exception/RequestException.php
@@ -10,5 +10,5 @@ abstract class RequestException extends RuntimeException implements SnmpExceptio
 {
     public string $host;
 
-    public ?string $oids = null;
+    public string|null $oids = null;
 }
diff --git a/src/Helpers/ValueGetter.php b/src/Helpers/ValueGetter.php
@@ -18,12 +18,11 @@ final class ValueGetter
      * @param array<int|string, mixed> $response
      * @psalm-param array<int|string, T> $response
      *
-     * @return mixed
      * @psalm-return T
      *
      * @psalm-template T
      */
-    public static function first(array $response)
+    public static function first(array $response): mixed
     {
         $result = array_shift($response);
         if ($result === null) {
@@ -33,8 +32,7 @@ public static function first(array $response)
         return $result;
     }
 
-    /** @return mixed */
-    public static function firstFromSameTree(SnmpClient $snmpClient, string $oid)
+    public static function firstFromSameTree(SnmpClient $snmpClient, string $oid): mixed
     {
         return self::firstFromSameTrees($snmpClient, [$oid])[0];
     }
diff --git a/src/Transport/ApiSnmpClient.php b/src/Transport/ApiSnmpClient.php
@@ -32,44 +32,17 @@ final class ApiSnmpClient implements SnmpClient
 {
     private const API_PATH = '/snmp-proxy';
 
-    private ClientInterface $client;
-
-    private RequestFactoryInterface $requestFactory;
-
-    private StreamFactoryInterface $streamFactory;
-
-    private string $apiHostUrl;
-
-    private string $host;
-
-    private string $community;
-
-    private int $timeout;
-
-    private int $retries;
-
-    private string $version;
-
     public function __construct(
-        ClientInterface $client,
-        RequestFactoryInterface $requestFactory,
-        StreamFactoryInterface $streamFactory,
-        string $apiHostUrl,
-        string $host = '127.0.0.1',
-        string $community = 'public',
-        int $timeout = 1,
-        int $retries = 3,
-        string $version = '2c'
+        private ClientInterface $client,
+        private RequestFactoryInterface $requestFactory,
+        private StreamFactoryInterface $streamFactory,
+        private string $apiHostUrl,
+        private string $host = '127.0.0.1',
+        private string $community = 'public',
+        private int $timeout = 1,
+        private int $retries = 3,
+        private string $version = '2c',
     ) {
-        $this->client = $client;
-        $this->requestFactory = $requestFactory;
-        $this->streamFactory = $streamFactory;
-        $this->apiHostUrl = $apiHostUrl;
-        $this->host = $host;
-        $this->community = $community;
-        $this->timeout = $timeout;
-        $this->retries = $retries;
-        $this->version = $version;
     }
 
     /** @inheritDoc */
diff --git a/src/Transport/Cli/SymfonyProcessProcessExecutor.php b/src/Transport/Cli/SymfonyProcessProcessExecutor.php
@@ -13,11 +13,8 @@
 
 final class SymfonyProcessProcessExecutor implements ProcessExecutor
 {
-    private int $commandTimeout;
-
-    public function __construct(int $commandTimeout)
+    public function __construct(private int $commandTimeout)
     {
-        $this->commandTimeout = $commandTimeout;
     }
 
     /** @inheritDoc */
diff --git a/src/Transport/CliSnmpClient.php b/src/Transport/CliSnmpClient.php
@@ -34,17 +34,15 @@ final class CliSnmpClient implements SnmpClient
     /** @var string[] */
     private array $processArgs;
 
-    private string $host;
-
     private bool $useBulk;
 
     public function __construct(
-        string $host = '127.0.0.1',
+        private string $host = '127.0.0.1',
         string $community = 'public',
         int $timeout = 1,
         int $retries = 3,
         string $version = '2c',
-        ?ProcessExecutor $processExecutor = null
+        ProcessExecutor|null $processExecutor = null,
     ) {
         if (! in_array($version, ['1', '2c'], true)) {
             throw InvalidVersionProvided::new($version);
@@ -64,7 +62,6 @@ public function __construct(
             $community,
             $host,
         ];
-        $this->host = $host;
         $this->useBulk = $version === '2c';
     }
 
diff --git a/src/Transport/ExtensionSnmpClient.php b/src/Transport/ExtensionSnmpClient.php
@@ -24,10 +24,8 @@ final class ExtensionSnmpClient implements SnmpClient
 
     private SNMP $snmp;
 
-    private string $host;
-
     public function __construct(
-        string $host = '127.0.0.1',
+        private string $host = '127.0.0.1',
         string $community = 'public',
         int $timeoutMs = 1000000,
         int $retry = 3,
@@ -36,7 +34,7 @@ public function __construct(
         string $authProtocol = 'MD5',
         string $authPassphrase = 'None',
         string $privProtocol = 'DES',
-        string $privPassphrase = 'None'
+        string $privPassphrase = 'None',
     ) {
         switch ($version) {
             case '1':
@@ -58,7 +56,6 @@ public function __construct(
         $this->snmp = new SNMP($snmpVersion, $host, $community, $timeoutMs, $retry);
         $this->snmp->oid_output_format = SNMP_OID_OUTPUT_NUMERIC;
         $this->snmp->exceptions_enabled = SNMP::ERRNO_ANY;
-        $this->host = $host;
 
         if ($snmpVersion !== SNMP::VERSION_3) {
             return;
diff --git a/src/Transport/FallbackSnmpClient.php b/src/Transport/FallbackSnmpClient.php
@@ -11,20 +11,12 @@
 
 final class FallbackSnmpClient implements SnmpClient
 {
-    private LoggerInterface $logger;
-
-    /** @var iterable<SnmpClient> */
-    private iterable $snmpClients;
-
     /** @param iterable<SnmpClient> $snmpClients */
-    public function __construct(LoggerInterface $logger, iterable $snmpClients)
+    public function __construct(private LoggerInterface $logger, private iterable $snmpClients)
     {
         if ($snmpClients === []) {
             throw GeneralException::new('No SNMP clients provided');
         }
-
-        $this->logger = $logger;
-        $this->snmpClients = $snmpClients;
     }
 
     /** @inheritDoc */
diff --git a/src/Transport/Request.php b/src/Transport/Request.php
@@ -10,19 +10,13 @@ final class Request
     public const GET_NEXT = 'getNext';
     public const WALK = 'walk';
 
-    public string $type;
-
     /** @var list<string> */
     public $oids;
 
-    public ?int $maxRepetitions = null;
-
     /** @param list<string> $oids */
-    private function __construct(string $type, array $oids, ?int $maxRepetitions = null)
+    private function __construct(public string $type, array $oids, public int|null $maxRepetitions = null)
     {
-        $this->type = $type;
         $this->oids = $oids;
-        $this->maxRepetitions = $maxRepetitions;
     }
 
     /** @param list<string> $oids */
diff --git a/src/Transport/ValueParser.php b/src/Transport/ValueParser.php
@@ -14,8 +14,7 @@
 
 final class ValueParser
 {
-    /** @return int|string */
-    public static function parse(string $rawValue)
+    public static function parse(string $rawValue): int|string
     {
         if ($rawValue === '""') {
             return '';
diff --git a/tests/Transport/CliSnmpClientTest.php b/tests/Transport/CliSnmpClientTest.php
@@ -459,7 +459,7 @@ function () use ($processExecutor): void {
         );
     }
 
-    private function createCliSnmp(string $version = '2c', ?ProcessExecutor $processExecutor = null): CliSnmpClient
+    private function createCliSnmp(string $version = '2c', ProcessExecutor|null $processExecutor = null): CliSnmpClient
     {
         return new CliSnmpClient(self::SNMP_HOST, 'public', 1, 3, $version, $processExecutor);
     }
diff --git a/tests/Transport/SimpleBatchTest.php b/tests/Transport/SimpleBatchTest.php
@@ -102,11 +102,8 @@ private function createBatchSnmpClient(SnmpClient $snmpClient): SnmpClient
         return new class ($snmpClient) implements SnmpClient {
             use SimpleBatch;
 
-            private SnmpClient $snmpClient;
-
-            public function __construct(SnmpClient $snmpClient)
+            public function __construct(private SnmpClient $snmpClient)
             {
-                $this->snmpClient = $snmpClient;
             }
 
             /** @inheritDoc */
diff --git a/tests/Transport/ValueParserTest.php b/tests/Transport/ValueParserTest.php
@@ -10,12 +10,8 @@
 
 final class ValueParserTest extends TestCase
 {
-    /**
-     * @param mixed $expected
-     *
-     * @dataProvider providerParse
-     */
-    public function testParse(string $raw, $expected): void
+    /** @dataProvider providerParse */
+    public function testParse(string $raw, mixed $expected): void
     {
         self::assertSame($expected, ValueParser::parse($raw));
     }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`final class EndOfMibReached extends RequestException`
`12`	`12`	`{`
`13`		`- public static function new(?Throwable $previous = null): self`
	`13`	`+ public static function new(Throwable\|null $previous = null): self`
`14`	`14`	`{`
`15`	`15`	`return new self('No more variables left in this MIB View (It is past the end of the MIB tree)', 0, $previous);`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static function fromThrowable(string $host, Throwable $throwable): self`
`33`	`33`	`return $self;`
`34`	`34`	`}`
`35`	`35`
`36`		`- private static function new(?Throwable $previous = null): self`
	`36`	`+ private static function new(Throwable\|null $previous = null): self`
`37`	`37`	`{`
`38`	`38`	`return new self('No Such Instance currently exists at this OID', 0, $previous);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@ abstract class RequestException extends RuntimeException implements SnmpExceptio`
`10`	`10`	`{`
`11`	`11`	`public string $host;`
`12`	`12`
`13`		`- public ?string $oids = null;`
	`13`	`+ public string\|null $oids = null;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,12 +18,11 @@ final class ValueGetter`
`18`	`18`	`* @param array<int\|string, mixed> $response`
`19`	`19`	`* @psalm-param array<int\|string, T> $response`
`20`	`20`	`*`
`21`		`- * @return mixed`
`22`	`21`	`* @psalm-return T`
`23`	`22`	`*`
`24`	`23`	`* @psalm-template T`
`25`	`24`	`*/`
`26`		`- public static function first(array $response)`
	`25`	`+ public static function first(array $response): mixed`
`27`	`26`	`{`
`28`	`27`	`$result = array_shift($response);`
`29`	`28`	`if ($result === null) {`
`@@ -33,8 +32,7 @@ public static function first(array $response)`
`33`	`32`	`return $result;`
`34`	`33`	`}`
`35`	`34`
`36`		`- /** @return mixed */`
`37`		`- public static function firstFromSameTree(SnmpClient $snmpClient, string $oid)`
	`35`	`+ public static function firstFromSameTree(SnmpClient $snmpClient, string $oid): mixed`
`38`	`36`	`{`
`39`	`37`	`return self::firstFromSameTrees($snmpClient, [$oid])[0];`
`40`	`38`	`}`