Prepare the library for PHP 8.2 and higher.

Remove dependency on PHPStan in the main codebase, which blocked updating other dependencies.

Author: lisiy50

.github/workflows/push.yml

@@ -49,7 +49,7 @@ jobs:
       matrix:
         operating-system:
           - ubuntu-latest
-        php-versions: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        php-versions: ['8.2', '8.3', '8.4']
     name: Unit tests for PHP version ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
     needs:
       - phpunit-with-coverage
@@ -142,7 +142,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          args: analyse src tests --configuration phpstan.neon
+          args: analyse src
 
   psalm:
     runs-on: ubuntu-latest
@@ -152,7 +152,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.3
+          php-version: 8.2
           ini-values: memory_limit=2G, display_errors=On, error_reporting=-1
           tools: pecl, psalm
 

Makefile

@@ -14,21 +14,26 @@ setup: install-phive
 phpcbf:
 	docker run -it --rm -v${CURDIR}:/opt/project -w /opt/project phpdoc/phpcs-ga:latest phpcbf ${ARGS}
 
+
+.PHONY: build-test-image
+build-test-image:
+	docker build -t php-graphviz -f tests/Resources/Dockerfile tests/Resources
+
 .PHONY: phpcs
-phpcs:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpcs-ga:latest -d memory_limit=1024M -s
+phpcs: build-test-image
+	docker run -it --rm -v${CURDIR}:/data -w /data php-graphviz vendor/bin/phpcs
 
 .PHONY: phpstan
-phpstan:
-	docker run -it --rm -v${CURDIR}:/opt/project -w /opt/project phpdoc/phpstan-ga:latest analyse src tests --configuration phpstan.neon ${ARGS}
+phpstan: build-test-image
+	docker run -it --rm -v${CURDIR}:/data -w /data php-graphviz ./vendor/phpstan/phpstan/phpstan analyse src ${ARGS}
 
 .PHONY: psalm
-psalm:
-	docker run -it --rm -v${CURDIR}:/data -w /data php:7.3 vendor/bin/psalm.phar
+psalm: build-test-image
+	docker run -it --rm -v${CURDIR}:/data -w /data php-graphviz vendor/bin/psalm.phar
 
 .PHONY: test
-test:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.3 vendor/bin/phpunit
+test: build-test-image
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php-graphviz ./vendor/bin/phpunit
 
 .PHONY: pre-commit-test
 pre-commit-test: phpcs phpstan psalm test

README.md

@@ -13,15 +13,3 @@ GraphViz
 
 GraphViz is a library meant for generating .dot files for GraphViz with a
 fluent interface.
-
-
-### PHPStan extension
-
-This library contains a number of magic methods to set attributes on `Node`, `Graph` and `Edge`
-this will result in errors when using the library with checks by PHPStan. For your convenience this
-library provides an phpStan extension so your code can be checked correctly by phpstan.
-
-```
-includes:
-    - vendor/phpdocumentor/graphviz/extension.neon
-```

composer.json

@@ -10,30 +10,35 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0"
+        "php": "^8.2"
     },
     "autoload": {
         "psr-4": {
-            "phpDocumentor\\GraphViz\\": "src/phpDocumentor/GraphViz",
-            "phpDocumentor\\GraphViz\\PHPStan\\": "./src/phpDocumentor/PHPStan"
+            "phpDocumentor\\GraphViz\\": "src/phpDocumentor/GraphViz"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "phpDocumentor\\GraphViz\\Test\\": "./tests/phpDocumentor/GraphViz/Test",
-            "phpDocumentor\\GraphViz\\PHPStan\\": "./tests/phpDocumentor/PHPStan"
+            "phpDocumentor\\GraphViz\\Test\\": "./tests/phpDocumentor/GraphViz/Test"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.2 || ^9.2",
-        "mockery/mockery": "^1.2",
-        "phpstan/phpstan": "^0.12",
+        "phpunit/phpunit": "^11.0",
+        "mockery/mockery": "@stable",
+        "phpstan/phpstan": "@stable",
         "ext-simplexml": "*",
-        "psalm/phar": "^4.15 || ^5.0"
+        "psalm/phar": "@stable",
+        "squizlabs/php_codesniffer": "@stable",
+        "phpstan/phpstan-mockery": "@stable"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-master": "3.x-dev"
+        }
+    },
+    "config": {
+        "allow-plugins": {
+            "ondrejmirtes/composer-attribute-collector": true
         }
     }
 }

extension.neon

@@ -6,9 +6,6 @@
     <file>tests</file>
     <arg value="p"/>
     <rule ref="PSR2" />
-    <rule ref="Doctrine">
-        <exclude name="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint.UselessDocComment" />
-    </rule>
 
     <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
         <exclude-pattern>tests/phpDocumentor/GraphViz/Test/GraphTest\.php</exclude-pattern>

phpcs.xml.dist

@@ -1,12 +1,8 @@
 includes:
-    - /composer/vendor/phpstan/phpstan-mockery/extension.neon
-    - ./extension.neon
+    - ./vendor/phpstan/phpstan-mockery/extension.neon
 
 parameters:
     level: max
     ignoreErrors:
         #We have some runtime protection that needs to be tested. Ignore these errors
-        - '#Call to an undefined method phpDocumentor\\GraphViz\\Edge::someNonExcistingMethod\(\)\.#'
-        - '#Call to an undefined method phpDocumentor\\GraphViz\\Graph::MyMethod\(\)\.#'
-        - '#Call to an undefined method phpDocumentor\\GraphViz\\Graph::getNotExisting\(\)\.#'
-        - '#Call to an undefined method phpDocumentor\\GraphViz\\Node::someNonExistingMethod\(\)\.#'
+        - '#Cannot cast mixed to string#'

phpstan.neon

@@ -16,9 +16,6 @@
         <testsuite name="Graphviz suite">
             <directory>./tests/phpDocumentor/GraphViz</directory>
         </testsuite>
-        <testsuite name="PHPStan suite">
-            <directory>./tests/phpDocumentor/PHPStan</directory>
-        </testsuite>
     </testsuites>
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml" />

phpunit.xml.dist

@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm
-        resolveFromConfigFile="true"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="https://getpsalm.org/schema/config"
         xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
@@ -22,5 +21,7 @@
                 <file name="src/phpDocumentor/GraphViz/Graph.php" />
             </errorLevel>
         </MixedArgumentTypeCoercion>
+        <PossiblyUnusedMethod errorLevel="suppress" />
+        <MissingOverrideAttribute errorLevel="suppress" />
     </issueHandlers>
 </psalm>

psalm.xml

@@ -21,14 +21,16 @@
  * Class representing a single GraphViz attribute.
  *
  * @link      http://phpdoc.org
+ *
+ * @psalm-suppress ClassMustBeFinal
  */
 class Attribute
 {
-    /** @var string The name of this attribute */
-    protected $key = '';
+    /** The name of this attribute */
+    protected string $key = '';
 
-    /** @var string The value of this attribute */
-    protected $value = '';
+    /** The value of this attribute */
+    protected string $value = '';
 
     /**
      * Creating a new attribute.