code analysis update

Author: codemasher

.gitattributes

@@ -1,19 +1,21 @@
-/.build            export-ignore
-/.github           export-ignore
-/.idea             export-ignore
-/.phan             export-ignore
-/.phpdoc           export-ignore
-/docs              export-ignore
-/examples          export-ignore
-/tests             export-ignore
-/.editorconfig     export-ignore
-/.gitattributes    export-ignore
-/.gitignore        export-ignore
-/.readthedocs.yml  export-ignore
-/composer.lock     export-ignore
-/phpcs.xml.dist    export-ignore
-/phpdoc.xml.dist   export-ignore
-/phpmd.xml.dist    export-ignore
-/phpunit.xml.dist  export-ignore
+/.build                 export-ignore
+/.github                export-ignore
+/.idea                  export-ignore
+/.phan                  export-ignore
+/.phpdoc                export-ignore
+/docs                   export-ignore
+/examples               export-ignore
+/tests                  export-ignore
+/.editorconfig          export-ignore
+/.gitattributes         export-ignore
+/.gitignore             export-ignore
+/.readthedocs.yml       export-ignore
+/composer.lock          export-ignore
+/phpcs.xml.dist         export-ignore
+/phpdoc.xml.dist        export-ignore
+/phpmd.xml.dist         export-ignore
+/phpunit.xml.dist       export-ignore
+/phpstan.dist.neon      export-ignore
+/phpstan-baseline.neon  export-ignore
 
 *.php diff=php

.github/workflows/ci.yml

@@ -38,10 +38,6 @@ jobs:
           - "8.2"
           - "8.3"
 
-    env:
-      PHAN_ALLOW_XDEBUG: 0
-      PHAN_DISABLE_XDEBUG_WARN: 1
-
     steps:
       - name: "Checkout"
         uses: actions/checkout@v4
@@ -50,18 +46,18 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          extensions: ast, ${{ env.PHP_EXTENSIONS }}
+          extensions: ${{ env.PHP_EXTENSIONS }}
           ini-values: ${{ env.PHP_INI_VALUES }}
           coverage: none
 
-#      - name: "Validate composer.json"
-#        run: composer validate --ansi --strict
-
       - name: "Install dependencies with composer"
         uses: ramsey/composer-install@v3
 
-      - name: "Run phan"
-        run: php vendor/bin/phan --target-php-version=${{ matrix.php-version }}
+      - name: "Run PHPStan"
+        run: php vendor/bin/phpstan
+
+      - name: "Run PHP_CodeSniffer"
+        run: php vendor/bin/phpcs
 
 
   tests:
@@ -79,6 +75,7 @@ jobs:
           - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"

.gitignore

@@ -19,3 +19,4 @@ phpdoc.xml
 phpmd.xml
 phpunit.xml
 *cacert.pem
+phpstan.neon

.phan/config.php

@@ -26,30 +26,38 @@
 		"php": "^8.1"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "^10.5",
-		"phan/phan": "^5.4",
 		"chillerlan/php-httpinterface": "^6.0",
-		"guzzlehttp/guzzle": "^7.8"
+		"guzzlehttp/guzzle": "^7.9",
+		"phpstan/phpstan": "^1.11",
+		"phpstan/phpstan-deprecation-rules": "^1.2",
+		"phpunit/phpunit": "^10.5",
+		"slevomat/coding-standard": "^8.15",
+		"squizlabs/php_codesniffer": "^3.10"
 	},
 	"suggest": {
 	},
 	"autoload": {
 		"psr-4": {
-			"chillerlan\\PHPUnitHttp\\": "src/"
+			"chillerlan\\PHPUnitHttp\\": "src"
 		}
 	},
 	"autoload-dev": {
 		"psr-4": {
-			"chillerlan\\PHPUnitHttpTest\\": "tests/"
+			"chillerlan\\PHPUnitHttpTest\\": "tests"
 		}
 	},
 	"scripts": {
-		"phpunit": "@php vendor/bin/phpunit",
-		"phan": "@php vendor/bin/phan"
+		"phpcs": "@php vendor/bin/phpcs",
+		"phpstan": "@php vendor/bin/phpstan",
+		"phpstan-baseline": "@php vendor/bin/phpstan --generate-baseline",
+		"phpunit": "@php vendor/bin/phpunit"
 	},
 	"config": {
 		"lock": false,
 		"sort-packages": true,
-		"platform-check": true
+		"platform-check": true,
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }