diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c182bc9..76b2e2b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,4 +42,4 @@ jobs: composer require typo3/cms-core:^$typo3 typo3/cms-frontend:^$typo3 typo3/cms-backend:^$typo3 - name: Run PHPStan - run: ./vendor/bin/phpstan analyse + run: composer phpstan diff --git a/.gitignore b/.gitignore index de4a392..767c516 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/vendor +/.Build /composer.lock diff --git a/composer.json b/composer.json index 53f49fd..0b4cff2 100644 --- a/composer.json +++ b/composer.json @@ -26,12 +26,14 @@ "typo3/cms-backend": "^11.0 || ^12.0", "typo3/cms-core": "^11.0 || ^12.0", "typo3/cms-frontend": "^11.0 || ^12.0", - "sentry/sentry": "^3.21" + "sentry/sentry": "^4.6" }, "extra": { "typo3/cms": { "extension-key": "sentry_client", - "cms-package-dir": "{$vendor-dir}/typo3/cms" + "cms-package-dir": "{$vendor-dir}/typo3/cms", + "app-dir": ".Build", + "web-dir": ".Build/Web" } }, "autoload": { @@ -39,22 +41,21 @@ "Networkteam\\SentryClient\\": "Classes/" } }, - "replace": { - "typo3-ter/sentry-client": "self.version" - }, "config": { "allow-plugins": { "typo3/cms-composer-installers": true, - "typo3/class-alias-loader": true, - "php-http/discovery": true - } + "typo3/class-alias-loader": true + }, + "vendor-dir": ".Build/vendor", + "bin-dir": ".Build/bin", + "sort-packages": true }, "require-dev": { "saschaegerer/phpstan-typo3": "^1.1" }, "scripts": { "phpstan": [ - "phpstan analyse -c phpstan.neon" + "phpstan analyse ." ] } } diff --git a/phpstan.neon b/phpstan.neon index d3a5aff..2c3c080 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,6 +1,6 @@ includes: - phpstan-baseline.neon - - vendor/saschaegerer/phpstan-typo3/extension.neon + - .Build/vendor/saschaegerer/phpstan-typo3/extension.neon parameters: # 0: basic checks @@ -14,8 +14,4 @@ parameters: # 8: report calling methods and accessing properties on nullable types level: 8 - paths: - - Classes - - ext_localconf.php - reportUnmatchedIgnoredErrors: true