Phpstan parser

.github/workflows/test.yml

@@ -78,6 +78,7 @@ jobs:
  matrix:
  os: [ubuntu-22.04]
  php-version: [8.1, 8.2, 8.3]
+ phpstan_parser: [true, false]
 
  steps:
  - name: "Checkout"
@@ -108,5 +109,15 @@ jobs:
  - name: "Install dependencies with composer"
  run: make composer-install
 
+ - name: Configure PhpStan Parser in 'deptrac.yaml'
+ if: matrix.phpstan_parser == 'false'
+ run: |
+ sed -i 's/phpstan_parser: true/phpstan_parser: false/' deptrac.yaml
+
+ - name: Configure PhpStan Parser in 'deptrac.config.php'
+ if: matrix.phpstan_parser == 'false'
+ run: |
+ sed -i 's/phpstanParser: true/phpstanParser: false/' deptrac.config.php
+
  - name: "Run deptrac"
  run: make deptrac

Makefile

@@ -14,8 +14,8 @@ help: ## Displays list of available targets with their descriptions
 
 
 .PHONY: build
-build: tests ## Runs tests and creates the phar-binary
- $(BOX_BIN) compile
+build: composer-install ## Creates the phar-binary
+ $(BOX_BIN) compile --no-parallel
 
 .PHONY: composer-install
 composer-install: ## Installs dependencies

baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
+<files psalm-version="5.23.0@005e3184fb6de4350a873b9b8c4dc3cede9db762">
  <file src="src/Contract/Result/OutputResult.php">
  <InvalidReturnStatement>
  <code><![CDATA[array_key_exists($type, $this->rules) ? array_values($this->rules[$type]) : []]]></code>
@@ -10,19 +10,32 @@
  </file>
  <file src="src/Core/Ast/AstMap/ClassLike/ClassLikeToken.php">
  <ArgumentTypeCoercion>
- <code>$pattern</code>
+ <code><![CDATA[$pattern]]></code>
  </ArgumentTypeCoercion>
  </file>
  <file src="src/Core/Ast/AstMap/Function/FunctionToken.php">
  <ArgumentTypeCoercion>
- <code>$pattern</code>
+ <code><![CDATA[$pattern]]></code>
  </ArgumentTypeCoercion>
  </file>
- <file src="src/Core/Ast/Parser/TypeScope.php">
+ <file src="src/Core/Ast/Parser/Extractors/ClassMethodExtractor.php">
+ <RedundantCondition>
+ <code><![CDATA[$resolvedPhpDoc->getThrowsTag()?->getType()->getReferencedClasses()]]></code>
+ </RedundantCondition>
+ <TypeDoesNotContainNull>
+ <code><![CDATA[[]]]></code>
+ </TypeDoesNotContainNull>
+ </file>
+ <file src="src/Core/Ast/Parser/NikicPhpParser/TypeScope.php">
  <RiskyTruthyFalsyComparison>
- <code>$alias</code>
+ <code><![CDATA[$alias]]></code>
  </RiskyTruthyFalsyComparison>
  </file>
+ <file src="src/Core/Ast/Parser/PhpStanParser/PhpStanTypeResolver.php">
+ <NamedArgumentNotAllowed>
+ <code><![CDATA[array_map(static fn ($type): array => self::resolveType($type, $scope), $type->types)]]></code>
+ </NamedArgumentNotAllowed>
+ </file>
  <file src="src/Core/Layer/Collector/BoolCollector.php">
  <RiskyTruthyFalsyComparison>
  <code><![CDATA[!$configuration['must']]]></code>
@@ -31,7 +44,7 @@
  </file>
  <file src="src/Core/Layer/Collector/ComposerFilesParser.php">
  <InvalidReturnStatement>
- <code>$lockedPackages</code>
+ <code><![CDATA[$lockedPackages]]></code>
  </InvalidReturnStatement>
  <InvalidReturnType>
  <code><![CDATA[array<string, array{
@@ -42,32 +55,32 @@
  </file>
  <file src="src/Core/Layer/Collector/DirectoryCollector.php">
  <ArgumentTypeCoercion>
- <code>$validatedPattern</code>
+ <code><![CDATA[$validatedPattern]]></code>
  </ArgumentTypeCoercion>
  </file>
  <file src="src/Core/Layer/Collector/GlobCollector.php">
  <ArgumentTypeCoercion>
- <code>$validatedPattern</code>
+ <code><![CDATA[$validatedPattern]]></code>
  </ArgumentTypeCoercion>
  </file>
  <file src="src/Core/Layer/Collector/MethodCollector.php">
  <ArgumentTypeCoercion>
- <code>$pattern</code>
+ <code><![CDATA[$pattern]]></code>
  </ArgumentTypeCoercion>
  </file>
  <file src="src/Core/Layer/Collector/RegexCollector.php">
  <ArgumentTypeCoercion>
- <code>$pattern</code>
+ <code><![CDATA[$pattern]]></code>
  </ArgumentTypeCoercion>
  </file>
  <file src="src/Core/Layer/Collector/TagValueRegexCollector.php">
  <ArgumentTypeCoercion>
- <code>$pattern</code>
+ <code><![CDATA[$pattern]]></code>
  </ArgumentTypeCoercion>
  </file>
  <file src="src/Supportive/Console/Command/DebugLayerRunner.php">
  <RiskyTruthyFalsyComparison>
- <code>$layer</code>
+ <code><![CDATA[$layer]]></code>
  </RiskyTruthyFalsyComparison>
  </file>
 </files>

bin/deptrac

@@ -20,10 +20,19 @@ if (PHP_VERSION_ID < 80100) {
  include_once $autoload;
  }
 })();
+(static function (): void {
+ if (\file_exists($autoload = __DIR__.'/../build/deptrac-build/phpstan/preload.php')) {
+ require_once $autoload;
+ }
+})();
+(static function (): void {
+ if (\file_exists($autoload = __DIR__.'/../build/deptrac-build/phpstan/vendor/autoload.php')) {
+ require_once $autoload;
+ }
+})();
 
-$xdebug = new XdebugHandler('DEPTRAC');
-$xdebug->check();
-unset($xdebug);
+//$xdebug = new XdebugHandler('DEPTRAC');
+//$xdebug->check();
+//unset($xdebug);
 
 (new Application())->run();
-

box.json.dist

@@ -13,12 +13,13 @@
  ],
  "finder": [
  {
- "in": ["src", "vendor"],
+ "in": ["src", "vendor", "build"],
  "notPath": "#jetbrains/phpstorm-stubs/.*/.*\\.php#",
  "exclude": [
  "examples",
  "test",
- "tests"
+ "tests",
+ "phpstan/phpstan"
  ]
  }
  ]

build-deptrac.sh

@@ -36,7 +36,7 @@ info "Copy package templates"
 cp -R $BUILD_DIR/template/* *.md mkdocs.yml docs -t $BUILD_TMP
 
 info "Copy build into deptrac distrubtion repository"
-cp -a $BUILD_TMP/. $DEPTRAC_DIR 
+cp -a $BUILD_TMP/. $DEPTRAC_DIR
 
 # info "Git commit changes"
 # echo "Update $(date)" > git_commit_message.txt

build/template/composer.json

@@ -4,6 +4,7 @@
  "license": "MIT",
  "require": {
  "php": "^8.1",
+ "phpstan/phpstan": "^1.6.8",
  "ext-json": "*"
  },
  "bin": [
@@ -18,7 +19,8 @@
  "Qossmic\\Deptrac\\": "src/"
  },
  "files": [
- "bootstrap.php"
+ "bootstrap.php",
+ "deptrac-build/phpstan/preload.php"
  ]
  }
 }

composer.json

@@ -29,6 +29,7 @@
  "phpdocumentor/graphviz": "^2.1",
  "phpdocumentor/type-resolver": "^1.6",
  "phpstan/phpdoc-parser": "^1.5",
+ "phpstan/phpstan": "^1.6.8",
  "psr/container": "^2.0",
  "psr/event-dispatcher": "^1.0",
  "symfony/config": "^6.0",
@@ -66,7 +67,6 @@
  "require-dev": {
  "friendsofphp/php-cs-fixer": "^3.4",
  "infection/infection": "^0.26.16",
- "phpstan/phpstan": "^1.6.8",
  "phpstan/phpstan-symfony": "^1.1",
  "phpunit/phpunit": "^10.2",
  "rector/rector": "^0.15.17",