Merge pull request #4 from pongee/php81

Switch to Php8.1

Author: pongee

.github/workflows/tests.yml

@@ -12,8 +12,10 @@ jobs:
       fail-fast: true
       matrix:
         php:
-          - '8.0'
           - '8.1'
+          - '8.2'
+          - '8.3'
+          - '8.4'
 
     name: PHP ${{ matrix.php }}
 
@@ -38,3 +40,9 @@ jobs:
 
       - name: Run static analysis
         run: composer run-script phpstan
+
+      - name: Run rector
+        run: composer run-script rector-dry-run
+
+      - name: Run phpcs analysis
+        run: composer run-script phpcs

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.0.0] - 2024-01-04
+### Changed
+- Switch to PHP 8.1
+
 ## [3.2.0] - 2022-03-05
 ### Added
 - Base Apache Cassandra support

composer.json

@@ -10,17 +10,18 @@
     "plantuml"
   ],
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.1",
     "ext-json": "*",
-    "symfony/console": "^3.0|^4.0|^5.0|^6.0",
-    "twig/twig": "^2.0"
+    "symfony/console": "^5.0||^6.0",
+    "twig/twig": "^3.0"
   },
   "require-dev": {
-    "roave/security-advisories": "dev-master",
-    "phpunit/phpunit": "^9.0",
-    "squizlabs/php_codesniffer": "^3.0",
-    "slevomat/coding-standard": "^7.0",
-    "phpstan/phpstan": "^1.4"
+    "phpstan/phpstan": "^2.0",
+    "phpunit/phpunit": "^10.0",
+    "rector/rector": "^2.0",
+    "roave/security-advisories": "dev-latest",
+    "slevomat/coding-standard": "^8.0",
+    "squizlabs/php_codesniffer": "^3.0"
   },
   "autoload": {
     "psr-4": {
@@ -36,9 +37,11 @@
     "database-schema-visualization"
   ],
   "scripts": {
-    "phpcs": "phpcs --standard=PSR12",
-    "phpstan": "phpstan analyse",
-    "test": "php ./vendor/bin/phpunit"
+    "phpcs": "phpcs",
+    "phpstan": "phpstan analyse --memory-limit=512M",
+    "test": "php ./vendor/bin/phpunit",
+    "rector": "php ./vendor/bin/rector process example src test",
+    "rector-dry-run": "php ./vendor/bin/rector process example src test --dry-run"
   },
   "config": {
     "allow-plugins": {

example/code/image.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection\ConnectionCollection;
 use Pongee\DatabaseSchemaVisualization\Export\Plantuml;

example/code/json.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection\ConnectionCollection;
 use Pongee\DatabaseSchemaVisualization\Export\Json;

example/code/plantuml.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 use Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection\ConnectionCollection;
 use Pongee\DatabaseSchemaVisualization\Export\Plantuml;

phpcs.xml

@@ -1,21 +1,10 @@
 <?xml version="1.0"?>
 <ruleset>
-	<config name="testVersion" value="7.1-"/>
 	<arg name="colors"/>
 
 	<file>src</file>
 	<file>test</file>
+	<file>example</file>
 
-    <rule ref="PSR2"/>
-	<rule ref="Generic.Arrays.DisallowLongArraySyntax.Found"/>
-
-	<config name="installed_paths" value="../../slevomat/coding-standard"/>
-	<rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
-		<properties>
-			<property name="newlinesCountBetweenOpenTagAndDeclare" value="0"/>
-			<property name="spacesCountAroundEqualsSign" value="0"/>
-		</properties>
-	</rule>
-	<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses"/>
-	<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
+	<rule ref="PSR12"></rule>
 </ruleset>

phpstan.neon.dist renamed to phpstan.neon

@@ -16,7 +16,3 @@ parameters:
 
     fileExtensions:
         - php
-
-    excludes_analyse:
-        - vendor
-

rector.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+use Rector\Config\RectorConfig;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
+use Rector\DeadCode\Rector\Node\RemoveNonExistingVarAnnotationRector;
+use Rector\DeadCode\Rector\Property\RemoveUselessReadOnlyTagRector;
+use Rector\DeadCode\Rector\Property\RemoveUselessVarTagRector;
+
+return RectorConfig::configure()
+    ->withRules([
+        RemoveUselessParamTagRector::class,
+        RemoveUselessReturnTagRector::class,
+        RemoveUselessReadOnlyTagRector::class,
+        RemoveNonExistingVarAnnotationRector::class,
+        RemoveUselessVarTagRector::class,
+    ])
+    ->withPreparedSets(
+        typeDeclarations: true,
+    )
+    ->withPhpSets(
+        php81: true,
+    );

src/Command/Mysql/MysqlCommandAbstract.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\Command\Mysql;
 
@@ -16,15 +18,11 @@ abstract class MysqlCommandAbstract extends Command
     protected const ARGUMENT_FILE = 'file';
     protected const OPTION_CONNECTION = 'connection';
 
-    protected ParserInterface $parser;
-
     protected string $rootDir;
 
-    public function __construct(ParserInterface $parser, string $rootDir)
+    public function __construct(protected ParserInterface $parser, string $rootDir)
     {
         parent::__construct();
-
-        $this->parser = $parser;
         $this->rootDir = rtrim($rootDir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         $this
@@ -103,9 +101,10 @@ protected function getForcedConnections(array $connections): ConnectionCollectio
                 \.
                 (?<parentTableColumns>[^.]+)
                 $
-            #x', $connection, $matches);
+            #x', (string) $connection, $matches);
 
-            if (!empty($matches['childTableName'])
+            if (
+                !empty($matches['childTableName'])
                 && !empty($matches['childTableColumns'])
                 && !empty($matches['parentTableName'])
                 && !empty($matches['parentTableColumns'])

src/Command/Mysql/MysqlImageCommand.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\Command\Mysql;
 

src/Command/Mysql/MysqlJsonCommand.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\Command\Mysql;
 

src/Command/Mysql/MysqlPlantumlCommand.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\Command\Mysql;
 

src/DataObject/Sql/Database/Connection/ConnectionAbstract.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Connection/ConnectionCollection.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Connection/ConnectionCollectionInterface.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Connection/ConnectionInterface.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Connection/ConnectionIterator.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Connection/NotDefinedConnection.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Connection/OneToManyConnection.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Connection/OneToOneConnection.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Connection;
 

src/DataObject/Sql/Database/Table.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database;
 
@@ -23,17 +25,17 @@ class Table implements TableInterface
 {
     private string $name = '';
 
-    private ColumnCollectionInterface|ColumnCollection $columns;
+    private readonly ColumnCollectionInterface|ColumnCollection $columns;
 
     private ?PrimaryKeyInterface $primaryKey = null;
 
-    private SimpleIndexCollection|SimpleIndexCollectionInterface $simpleIndexes;
+    private readonly SimpleIndexCollection|SimpleIndexCollectionInterface $simpleIndexes;
 
-    private UniqueIndexCollectionInterface|UniqueIndexCollection $uniqueIndexes;
+    private readonly UniqueIndexCollectionInterface|UniqueIndexCollection $uniqueIndexes;
 
-    private FulltextIndexCollectionInterface|FulltextIndexCollection $fulltextIndexes;
+    private readonly FulltextIndexCollectionInterface|FulltextIndexCollection $fulltextIndexes;
 
-    private SpatialIndexCollection|SpatialIndexCollectionInterface $spatialIndexes;
+    private readonly SpatialIndexCollection|SpatialIndexCollectionInterface $spatialIndexes;
 
     public function __construct()
     {

src/DataObject/Sql/Database/Table/Column.php

@@ -1,15 +1,17 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Table;
 
 class Column implements ColumnInterface
 {
     public function __construct(
-        private string $name,
-        private string $type,
-        private array $typeParameters,
-        private string $otherParameters,
-        private string $comment
+        private readonly string $name,
+        private readonly string $type,
+        private readonly array $typeParameters,
+        private readonly string $otherParameters,
+        private readonly string $comment
     ) {
     }
 

src/DataObject/Sql/Database/Table/ColumnCollection.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Table;
 
@@ -7,7 +9,7 @@ class ColumnCollection implements ColumnCollectionInterface
     /** @var ColumnInterface[] */
     private array $columns = [];
 
-    public function add(ColumnInterface $column)
+    public function add(ColumnInterface $column): void
     {
         $this->columns[$column->getName()] = $column;
     }

src/DataObject/Sql/Database/Table/ColumnCollectionInterface.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Table;
 

src/DataObject/Sql/Database/Table/ColumnInterface.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Table;
 

src/DataObject/Sql/Database/Table/ColumnIterator.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Table;
 

src/DataObject/Sql/Database/Table/Index/FulltextIndex.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Table\Index;
 

src/DataObject/Sql/Database/Table/Index/FulltextIndexCollection.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Pongee\DatabaseSchemaVisualization\DataObject\Sql\Database\Table\Index;