Rector/CS/CI cleanup

Author: josbeir

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  PHP_EXTENSIONS: intl pdo_sqlite
+  PHP_EXTENSIONS: intl
 
 jobs:
   test:
@@ -20,11 +20,14 @@ jobs:
           - php-version: '8.2'
             prefer-lowest: 'prefer-lowest'
 
-    container:
-      image: thecodingmachine/php:${{ matrix.php-version }}-v5-cli
-      options: --user root
-
     steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: ${{ env.PHP_EXTENSIONS }}
+          coverage: pcov
+
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -49,18 +52,27 @@ jobs:
         if: matrix.prefer-lowest == 'prefer-lowest'
         run: vendor/bin/validate-prefer-lowest -m
 
+      - name: Upload coverage reports to Codecov
+        if: success() && matrix.php-version == '8.4'
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: josbeir/cakephp-uid
+
   static-analysis:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event_name == 'pull_request'
 
-    container:
-      image: thecodingmachine/php:8.4-v5-cli
-      options: --user root
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.4
+          extensions: ${{ env.PHP_EXTENSIONS }}
+
       - name: Install dependencies
         run: composer install --prefer-dist --no-interaction --no-progress
 
@@ -69,3 +81,6 @@ jobs:
 
       - name: Run PHPCS
         run: vendor/bin/phpcs
+
+      - name: Run Rector
+        run: vendor/bin/rector process --dry-run

LICENSE.md

@@ -0,0 +1,9 @@
+
+
+Copyright 2025
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,7 +1,9 @@
 [![CI](https://github.com/josbeir/cakephp-uid/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/josbeir/cakephp-uid/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/josbeir/cakephp-uid/graph/badge.svg?token=CCX9UIFF28)](https://codecov.io/gh/josbeir/cakephp-uid)
 [![PHPStan](https://img.shields.io/badge/PHPStan-level%208-brightgreen.svg?style=flat)](https://phpstan.org/)
 [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.2-8892BF.svg)](https://php.net/)
 [![Packagist Downloads](https://img.shields.io/packagist/dt/josbeir/cakephp-uid)](https://packagist.org/packages/josbeir/cakephp-uid)
+[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.md)
 
 # CakePHP UID Plugin
 
@@ -59,7 +61,7 @@ This plugin utilizes the [Symfony UID component](https://symfony.com/doc/current
 
 ## License
 
-MIT
+[MIT](LICENSE.md)
 
 ## Contributing
 

composer.json

@@ -18,7 +18,8 @@
         "cakephp/plugin-installer": "^2.0.1",
         "phpunit/phpunit": "^11.0 || ^12.0",
         "phpstan/phpstan": "^2.1",
-        "cakephp/cakephp-codesniffer": "^5.2"
+        "cakephp/cakephp-codesniffer": "^5.2",
+        "rector/rector": "^2.1"
     },
     "license": "MIT",
    	"minimum-stability": "stable",
@@ -45,12 +46,12 @@
         }
     },
     "scripts": {
-		"lowest": "validate-prefer-lowest",
+        "lowest": "validate-prefer-lowest",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --log-junit tmp/coverage/unitreport.xml --coverage-html tmp/coverage --coverage-clover tmp/coverage/coverage.xml",
-		"stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^2.0.0 && mv composer.backup composer.json",
-        "stan-tests": "phpstan analyse -c tests/phpstan.neon",
-        "cs-check": "phpcs --colors -p -s --extensions=php src/ tests/",
-        "cs-fix": "phpcbf --colors -p -s --extensions=php src/ tests/"
+        "test-coverage": "export XDEBUG_MODE=coverage; phpunit --log-junit tmp/coverage/unitreport.xml --coverage-html tmp/coverage --coverage-clover tmp/coverage/coverage.xml",
+        "stan": "phpstan analyse",
+        "cs-check": "phpcs --colors -p -s",
+        "cs-fix": "phpcbf --colors -p -s",
+        "rector": "rector --ansi"
     }
 }

rector.php

@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
+use Rector\Config\RectorConfig;
+use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
+use Rector\ValueObject\PhpVersion;
+
+return RectorConfig::configure()
+    ->withPhpVersion(PhpVersion::PHP_83)
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->withSkip([
+        DisallowedEmptyRuleFixerRector::class,
+        SimplifyIfElseToTernaryRector::class,
+    ])
+    ->withImportNames(
+        importNames: true,
+        importDocBlockNames: false,
+        importShortClasses: false,
+        removeUnusedImports: true,
+    )
+    ->withParallel()
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        //naming: true,
+        typeDeclarations: true,
+    );

src/Database/Type/AbstractBinaryType.php

@@ -23,7 +23,6 @@ abstract class AbstractBinaryType extends BaseType
      *
      * @param mixed $value The value to convert.
      * @param \Cake\Database\Driver $driver The driver instance to convert with.
-     * @return mixed
      */
     public function toDatabase(mixed $value, Driver $driver): mixed
     {
@@ -70,9 +69,11 @@ public function toPHP(mixed $value, Driver $driver): mixed
         if ($value === null) {
             return null;
         }
+
         if (is_string($value)) {
             return $this->convertBinaryUidToString($value);
         }
+
         if (is_resource($value)) {
             return $value;
         }

src/Database/Type/AbstractType.php

@@ -16,7 +16,6 @@ abstract class AbstractType extends StringType
      *
      * @param mixed $value value to be converted to database equivalent
      * @param \Cake\Database\Driver $driver object from which database preferences and configuration will be extracted
-     * @return string|null
      */
     public function toDatabase(mixed $value, Driver $driver): ?string
     {

src/Database/Type/BinaryUlidType.php

@@ -29,7 +29,7 @@ public function convertStringToBinaryUid(string $string): string
     /**
      * @inheritDoc
      */
-    public function generateUid(): string
+    protected function generateUid(): string
     {
         return Ulid::generate();
     }

src/Database/Type/BinaryUuidV4Type.php

@@ -29,7 +29,7 @@ public function convertStringToBinaryUid(string $string): string
     /**
      * @inheritDoc
      */
-    public function generateUid(): string
+    protected function generateUid(): string
     {
         return Uuid::v4()->toString();
     }

src/Database/Type/BinaryUuidV6Type.php

@@ -29,7 +29,7 @@ public function convertStringToBinaryUid(string $string): string
     /**
      * @inheritDoc
      */
-    public function generateUid(): string
+    protected function generateUid(): string
     {
         return Uuid::v6()->toString();
     }