Merge pull request #44 from remotelyliving/ci-fixes

Ci fixes

.github/workflows/php-ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.4', '8.1']
+        php-versions: ['7.4', '8.0']
     name: PHP ${{ matrix.php-versions }} Test on Ubuntu
     steps:
       - uses: actions/checkout@v2

Makefile

@@ -26,7 +26,7 @@ churn-report:
 	@vendor/bin/churn run
 
 static-analysis:
-	@vendor/bin/phpstan analyze --level=max ./src && ./vendor/bin/psalm --show-info=false
+	@vendor/bin/phpstan analyze --level=8 ./src && ./vendor/bin/psalm --show-info=false
 
 style-fix:
 	@vendor/bin/phpcbf --standard=PSR12 ./src ./tests

composer.json

@@ -31,7 +31,7 @@
         "php-coveralls/php-coveralls": "^2.1",
         "symfony/cache": "^4.3",
         "vimeo/psalm": "^4.10",
-        "rector/rector": "^0.11.58",
+        "rector/rector": "^0.12.8",
         "bmitch/churn-php": "^1.5"
     },
     "autoload": {

phpstan.neon

@@ -2,32 +2,3 @@ parameters:
 	checkMissingIterableValueType: false
 	checkGenericClassInNonGenericObjectType: false
 	ignoreErrors:
-		-
-			message: "#^Method RemotelyLiving\\\\PHPDNS\\\\Entities\\\\DNSRecordCollection\\:\\:offsetExists\\(\\) has parameter \\$offset with no typehint specified\\.$#"
-			count: 1
-			path: src/Entities/DNSRecordCollection.php
-
-		-
-			message: "#^Method RemotelyLiving\\\\PHPDNS\\\\Entities\\\\DNSRecordCollection\\:\\:offsetGet\\(\\) has parameter \\$offset with no typehint specified\\.$#"
-			count: 1
-			path: src/Entities/DNSRecordCollection.php
-
-		-
-			message: "#^Method RemotelyLiving\\\\PHPDNS\\\\Entities\\\\DNSRecordCollection\\:\\:offsetSet\\(\\) has parameter \\$offset with no typehint specified\\.$#"
-			count: 1
-			path: src/Entities/DNSRecordCollection.php
-
-		-
-			message: "#^Method RemotelyLiving\\\\PHPDNS\\\\Entities\\\\DNSRecordCollection\\:\\:offsetSet\\(\\) has parameter \\$value with no typehint specified\\.$#"
-			count: 1
-			path: src/Entities/DNSRecordCollection.php
-
-		-
-			message: "#^Method RemotelyLiving\\\\PHPDNS\\\\Entities\\\\DNSRecordCollection\\:\\:offsetUnset\\(\\) has parameter \\$offset with no typehint specified\\.$#"
-			count: 1
-			path: src/Entities/DNSRecordCollection.php
-
-		-
-			message: "#^Variable \\$record in PHPDoc tag @var does not exist\\.$#"
-			count: 1
-			path: src/Entities/DNSRecordCollection.php

rector.php

@@ -4,7 +4,7 @@
 
 use Rector\Core\Configuration\Option;
 use Rector\Php74\Rector\Property\TypedPropertyRector;
-use Rector\Set\ValueObject\SetList;
+use Rector\Set\ValueObject\LevelSetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
@@ -15,11 +15,11 @@
     ]);
 
     // Define what rule sets will be applied
-    $containerConfigurator->import(SetList::DEAD_CODE);
+    $containerConfigurator->import(LevelSetList::UP_TO_PHP_81);
 
     // get services (needed for register a single rule)
-    // $services = $containerConfigurator->services();
+    $services = $containerConfigurator->services();
 
     // register a single rule
-    // $services->set(TypedPropertyRector::class);
+    $services->set(TypedPropertyRector::class);
 };

src/Entities/CNAMEData.php

@@ -41,6 +41,7 @@ public function serialize(): string
      */
     public function unserialize($serialized): void
     {
+        /** @var array{'hostname': string} $unserialized */
         $unserialized = unserialize($serialized);
         $this->hostname = new Hostname($unserialized['hostname']);
     }

src/Entities/DNSRecordCollection.php

@@ -87,17 +87,27 @@ public function rewind(): void
         $this->records->rewind();
     }
 
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
     public function offsetExists($offset): bool
     {
         return $this->records->offsetExists($offset);
     }
 
+    /**
+     * @param mixed $offset
+     * @return \RemotelyLiving\PHPDNS\Entities\Interfaces\DNSRecordInterface
+     */
     public function offsetGet($offset): DNSRecordInterface
     {
         return $this->records->offsetGet($offset);
     }
 
     /**
+     * @param mixed $offset
+     * @param mixed $value
      * @throws \RemotelyLiving\PHPDNS\Exceptions\InvalidArgumentException
      */
     public function offsetSet($offset, $value): void
@@ -109,6 +119,9 @@ public function offsetSet($offset, $value): void
         $this->records->offsetSet($offset, /** @scrutinizer ignore-type */ $value);
     }
 
+    /**
+     * @param mixed $offset
+     */
     public function offsetUnset($offset): void
     {
         $this->records->offsetUnset($offset);
@@ -165,7 +178,6 @@ private function filterValues(callable $eval): self
         $filtered = new self();
         $records = $this->records->getArrayCopy();
 
-        /** @var \RemotelyLiving\PHPDNS\Entities\Interfaces\DNSRecordInterface $record */
         while ($record = array_shift($records)) {
             if ($eval($record, new self(...$records))) {
                 $filtered[] = $record;

src/Entities/EntityAbstract.php

@@ -4,5 +4,4 @@
 
 abstract class EntityAbstract
 {
-
 }

src/Entities/PTRData.php

@@ -44,4 +44,4 @@ public function unserialize($serialized): void
         $unserialized = unserialize($serialized);
         $this->hostname = new Hostname($unserialized['hostname']);
     }
-}
+}

src/Exceptions/InvalidArgumentException.php

@@ -4,5 +4,4 @@
 
 final class InvalidArgumentException extends Exception
 {
-
 }

src/Resolvers/Exceptions/QueryFailure.php

@@ -6,5 +6,4 @@
 
 class QueryFailure extends Exception
 {
-
 }

src/Resolvers/Exceptions/ReverseLookupFailure.php

@@ -4,5 +4,4 @@
 
 final class ReverseLookupFailure extends QueryFailure
 {
-
 }

src/Resolvers/Interfaces/ObservableResolver.php

@@ -7,5 +7,4 @@
 
 interface ObservableResolver extends Resolver, Observable, LoggerAwareInterface
 {
-
 }

tests/Unit/Entities/CAADataTest.php

@@ -11,7 +11,6 @@
 
 class CAADataTest extends BaseTestAbstract
 {
-
     private $flags = 0;
 
     private $tag = 'issue';