Add rector [batch] (#41)

xepozz · vjik · web-flow · commit c15bbf5f6344 · 2023-02-09T20:49:46.000+03:00
Co-authored-by: Sergei Predvoditelev &lt;sergei@predvoditelev.ru&gt;
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -0,0 +1,21 @@
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.gitignore'
+      - '.gitattributes'
+      - 'infection.json.dist'
+      - 'psalm.xml'
+
+name: rector
+
+jobs:
+  rector:
+    uses: yiisoft/actions/.github/workflows/rector.yml@master
+    with:
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']
diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
     "require-dev": {
         "maglnet/composer-require-checker": "^4.4",
         "phpunit/phpunit": "^9.5",
+        "rector/rector": "^0.15.13",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.30|^5.6"
diff --git a/rector.php b/rector.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
+use Rector\Config\RectorConfig;
+use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Set\ValueObject\LevelSetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ]);
+
+    // register a single rule
+    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+
+    // define sets of rules
+    $rectorConfig->sets([
+        LevelSetList::UP_TO_PHP_80,
+    ]);
+
+    $rectorConfig->skip([
+        ClosureToArrowFunctionRector::class,
+    ]);
+};
diff --git a/src/Memcached.php b/src/Memcached.php
@@ -161,7 +161,7 @@ private function normalizeTtl(DateInterval|int|string|null $ttl): int
 
         $ttl = (int) $ttl;
 
-        if ($ttl > 2592000) {
+        if ($ttl > 2_592_000) {
             return $ttl + time();
         }
 
@@ -170,10 +170,6 @@ private function normalizeTtl(DateInterval|int|string|null $ttl): int
 
     /**
      * Converts iterable to array.
-     *
-     * @param iterable $iterable
-     *
-     * @return array
      */
     private function iterableToArray(iterable $iterable): array
     {
@@ -182,9 +178,6 @@ private function iterableToArray(iterable $iterable): array
     }
 
     /**
-     * @param array $servers
-     * @param string $persistentId
-     *
      * @throws CacheException If an error occurred when adding servers to the server pool.
      * @throws InvalidArgumentException If the servers format is incorrect.
      */
@@ -203,10 +196,6 @@ private function initServers(array $servers, string $persistentId): void
 
     /**
      * Returns the list of the servers that are not in the pool.
-     *
-     * @param array $servers
-     *
-     * @return array
      */
     private function getNewServers(array $servers): array
     {
diff --git a/tests/MemcachedTest.php b/tests/MemcachedTest.php
@@ -189,8 +189,6 @@ public function testClear($key, $value): void
     /**
      * @dataProvider dataProviderSetMultiple
      *
-     * @param int|null $ttl
-     *
      * @throws InvalidArgumentException
      */
     public function testSetMultiple(?int $ttl): void
@@ -292,16 +290,13 @@ public function dataProviderNormalizeTtl(): array
     /**
      * @dataProvider dataProviderNormalizeTtl
      *
-     * @param mixed $ttl
-     * @param mixed $expectedResult
-     *
      * @throws ReflectionException
      */
-    public function testNormalizeTtl($ttl, $expectedResult): void
+    public function testNormalizeTtl(mixed $ttl, mixed $expectedResult): void
     {
         $cache = $this->createCacheInstance();
         $ttl = $this->invokeMethod($cache, 'normalizeTtl', [$ttl]);
-        $ttl = $ttl < 2592001 ? $ttl : $ttl - time();
+        $ttl = $ttl < 2_592_001 ? $ttl : $ttl - time();
 
         $this->assertSameExceptObject($expectedResult, $ttl);
     }
@@ -339,9 +334,6 @@ public function getIterator(): ArrayIterator
     /**
      * @dataProvider iterableProvider
      *
-     * @param array $array
-     * @param iterable $iterable
-     *
      * @throws InvalidArgumentException
      */
     public function testValuesAsIterable(array $array, iterable $iterable): void
@@ -475,10 +467,8 @@ public function invalidKeyProvider(): array
 
     /**
      * @dataProvider invalidKeyProvider
-     *
-     * @param mixed $key
      */
-    public function testGetThrowExceptionForInvalidKey($key): void
+    public function testGetThrowExceptionForInvalidKey(mixed $key): void
     {
         $cache = $this->createCacheInstance();
         $this->expectException(InvalidArgumentException::class);
@@ -487,10 +477,8 @@ public function testGetThrowExceptionForInvalidKey($key): void
 
     /**
      * @dataProvider invalidKeyProvider
-     *
-     * @param mixed $key
      */
-    public function testSetThrowExceptionForInvalidKey($key): void
+    public function testSetThrowExceptionForInvalidKey(mixed $key): void
     {
         $cache = $this->createCacheInstance();
         $this->expectException(InvalidArgumentException::class);
@@ -499,10 +487,8 @@ public function testSetThrowExceptionForInvalidKey($key): void
 
     /**
      * @dataProvider invalidKeyProvider
-     *
-     * @param mixed $key
      */
-    public function testDeleteThrowExceptionForInvalidKey($key): void
+    public function testDeleteThrowExceptionForInvalidKey(mixed $key): void
     {
         $cache = $this->createCacheInstance();
         $this->expectException(InvalidArgumentException::class);
@@ -511,10 +497,8 @@ public function testDeleteThrowExceptionForInvalidKey($key): void
 
     /**
      * @dataProvider invalidKeyProvider
-     *
-     * @param mixed $key
      */
-    public function testGetMultipleThrowExceptionForInvalidKeys($key): void
+    public function testGetMultipleThrowExceptionForInvalidKeys(mixed $key): void
     {
         $cache = $this->createCacheInstance();
         $this->expectException(InvalidArgumentException::class);
@@ -523,10 +507,8 @@ public function testGetMultipleThrowExceptionForInvalidKeys($key): void
 
     /**
      * @dataProvider invalidKeyProvider
-     *
-     * @param mixed $key
      */
-    public function testDeleteMultipleThrowExceptionForInvalidKeys($key): void
+    public function testDeleteMultipleThrowExceptionForInvalidKeys(mixed $key): void
     {
         $cache = $this->createCacheInstance();
         $this->expectException(InvalidArgumentException::class);
@@ -557,7 +539,6 @@ private function createCacheInstance($persistentId = '', array $servers = []): C
      *
      * @param $object
      * @param $method
-     * @param array $args
      * @param bool $revoke whether to make method inaccessible after execution
      *
      * @throws ReflectionException
@@ -581,12 +562,9 @@ private function invokeMethod($object, $method, array $args = [], bool $revoke =
     /**
      * Sets an inaccessible object property to a designated value.
      *
-     * @param object $object
-     * @param string $propertyName
-     * @param mixed $value
      * @param bool $revoke whether to make property inaccessible after setting
      */
-    private function setInaccessibleProperty(object $object, string $propertyName, $value, bool $revoke = true): void
+    private function setInaccessibleProperty(object $object, string $propertyName, mixed $value, bool $revoke = true): void
     {
         $class = new ReflectionClass($object);
 
@@ -606,8 +584,6 @@ private function setInaccessibleProperty(object $object, string $propertyName, $
     /**
      * Gets an inaccessible object property.
      *
-     * @param object $object
-     * @param string $propertyName
      * @param bool $revoke whether to make property inaccessible after getting
      *
      * @return mixed
