Skip to content

Replace Psalm with PHPStan, require PHP 8.1 and Symfony ^6.4 || ^7.4 || ^8.0 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loevgaard merged 2 commits into from
Sep 21, 2026
Merged

Replace Psalm with PHPStan, require PHP 8.1 and Symfony ^6.4 || ^7.4 || ^8.0 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e02625c
Replace Psalm with PHPStan, require PHP 8.1 and Symfony ^6.4 || ^7.4 …
loevgaard Sep 21, 2026
789a98a
Update the popular bots list and match it case-insensitively
loevgaard Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
/ecs.php export-ignore
/infection.json.dist export-ignore
/phpunit.xml.dist export-ignore
/psalm.xml export-ignore
/phpstan.neon.dist export-ignore
/README.md export-ignore
121 changes: 35 additions & 86 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.1"

dependencies:
- "highest"
Expand Down Expand Up @@ -53,49 +53,32 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"

dependencies:
- "lowest"
- "highest"

symfony:
- "~5.4.0"
- "~6.4.0"
- "~7.0.0"
- "~7.1.0"
- "~7.2.0"
- "~7.4.0"
- "~8.0.0"

exclude:
# PHP 7.4
- php-version: "7.4"
symfony: "~6.4.0"
- php-version: "7.4"
symfony: "~7.0.0"
- php-version: "7.4"
symfony: "~7.1.0"
- php-version: "7.4"
symfony: "~7.2.0"
# PHP 8.0
- php-version: "8.0"
symfony: "~6.4.0"
- php-version: "8.0"
symfony: "~7.0.0"
- php-version: "8.0"
symfony: "~7.1.0"
- php-version: "8.0"
symfony: "~7.2.0"
# PHP 8.1
- php-version: "8.1"
symfony: "~7.0.0"
- php-version: "8.1"
symfony: "~7.1.0"
symfony: "~7.4.0"
- php-version: "8.1"
symfony: "~7.2.0"
symfony: "~8.0.0"
# PHP 8.2
- php-version: "8.2"
symfony: "~8.0.0"
# PHP 8.3
- php-version: "8.3"
symfony: "~8.0.0"

steps:
- name: "Checkout"
Expand Down Expand Up @@ -127,49 +110,32 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"

dependencies:
- "lowest"
- "highest"

symfony:
- "~5.4.0"
- "~6.4.0"
- "~7.0.0"
- "~7.1.0"
- "~7.2.0"
- "~7.4.0"
- "~8.0.0"

exclude:
# PHP 7.4
- php-version: "7.4"
symfony: "~6.4.0"
- php-version: "7.4"
symfony: "~7.0.0"
- php-version: "7.4"
symfony: "~7.1.0"
- php-version: "7.4"
symfony: "~7.2.0"
# PHP 8.0
- php-version: "8.0"
symfony: "~6.4.0"
- php-version: "8.0"
symfony: "~7.0.0"
- php-version: "8.0"
symfony: "~7.1.0"
- php-version: "8.0"
symfony: "~7.2.0"
# PHP 8.1
- php-version: "8.1"
symfony: "~7.0.0"
symfony: "~7.4.0"
- php-version: "8.1"
symfony: "~7.1.0"
- php-version: "8.1"
symfony: "~7.2.0"
symfony: "~8.0.0"
# PHP 8.2
- php-version: "8.2"
symfony: "~8.0.0"
# PHP 8.3
- php-version: "8.3"
symfony: "~8.0.0"

steps:
- name: "Checkout"
Expand All @@ -191,7 +157,7 @@ jobs:
dependency-versions: "${{ matrix.dependencies }}"

- name: "Static analysis"
run: "vendor/bin/psalm --php-version=${{ matrix.php-version }}"
run: "vendor/bin/phpstan analyse --no-progress"

unit-tests:
name: "Unit tests"
Expand All @@ -201,49 +167,32 @@ jobs:
strategy:
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- "8.3"
- "8.4"

dependencies:
- "lowest"
- "highest"

symfony:
- "~5.4.0"
- "~6.4.0"
- "~7.0.0"
- "~7.1.0"
- "~7.2.0"
- "~7.4.0"
- "~8.0.0"

exclude:
# PHP 7.4
- php-version: "7.4"
symfony: "~6.4.0"
- php-version: "7.4"
symfony: "~7.0.0"
- php-version: "7.4"
symfony: "~7.1.0"
- php-version: "7.4"
symfony: "~7.2.0"
# PHP 8.0
- php-version: "8.0"
symfony: "~6.4.0"
- php-version: "8.0"
symfony: "~7.0.0"
- php-version: "8.0"
symfony: "~7.1.0"
- php-version: "8.0"
symfony: "~7.2.0"
# PHP 8.1
- php-version: "8.1"
symfony: "~7.0.0"
- php-version: "8.1"
symfony: "~7.1.0"
symfony: "~7.4.0"
- php-version: "8.1"
symfony: "~7.2.0"
symfony: "~8.0.0"
# PHP 8.2
- php-version: "8.2"
symfony: "~8.0.0"
# PHP 8.3
- php-version: "8.3"
symfony: "~8.0.0"

steps:
- name: "Checkout"
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/vendor/
/composer.lock
/.phpunit.result.cache
/.phpunit.cache/
/build/
36 changes: 22 additions & 14 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,32 @@
}
],
"require": {
"php": ">=7.4",
"symfony/config": "^5.4 || ^6.4 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
"symfony/http-foundation": "^5.4 || ^6.4 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
"php": ">=8.1",
"symfony/config": "^6.4 || ^7.4 || ^8.0",
"symfony/dependency-injection": "^6.4 || ^7.4 || ^8.0",
"symfony/http-foundation": "^6.4 || ^7.4 || ^8.0",
"symfony/http-kernel": "^6.4 || ^7.4 || ^8.0",
"twig/twig": "^2.14 || ^3.4"
},
"require-dev": {
"infection/infection": "^0.26.6 || ^0.27.0",
"ergebnis/composer-normalize": "^2.42",
"infection/infection": "^0.27.0 || ^0.32.0",
"jangregor/phpstan-prophecy": "^2.0",
"matomo/device-detector": "^5.0 || ^6.0",
"matthiasnoback/symfony-dependency-injection-test": "^4.3 || ^5.1",
"matthiasnoback/symfony-dependency-injection-test": "^5.1 || ^6.3",
"nette/php-generator": "^3.6 || ^4.1",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.6",
"psalm/plugin-phpunit": "^0.18",
"setono/code-quality-pack": "^2.9",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^2.1",
"phpstan/phpstan-phpunit": "^2.0",
"phpstan/phpstan-strict-rules": "^2.0",
"phpstan/phpstan-webmozart-assert": "^2.0",
"phpunit/phpunit": "^10.5",
"rector/rector": "^2.0",
"shipmonk/composer-dependency-analyser": "^1.8",
"symfony/console": "^5.4 || ^6.4 || ^7.0",
"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
"sylius-labs/coding-standard": "^4.1.1",
"symfony/console": "^6.4 || ^7.4 || ^8.0",
"symfony/yaml": "^6.4 || ^7.4 || ^8.0",
"webmozart/assert": "^1.11"
},
"prefer-stable": true,
Expand All @@ -46,12 +53,13 @@
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": false,
"ergebnis/composer-normalize": true,
"infection/extension-installer": true
"infection/extension-installer": true,
"phpstan/extension-installer": true
},
"sort-packages": true
},
"scripts": {
"analyse": "psalm",
"analyse": "phpstan analyse",
"check-style": "ecs check",
"fix-style": "ecs check --fix",
"phpunit": "phpunit"
Expand Down
9 changes: 4 additions & 5 deletions ecs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

declare(strict_types=1);

use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
use Symplify\EasyCodingStandard\ValueObject\Option;
use Symplify\EasyCodingStandard\Config\ECSConfig;

return static function (ContainerConfigurator $configurator): void {
$configurator->import('vendor/sylius-labs/coding-standard/ecs.php');
$configurator->parameters()->set(Option::PATHS, [
return static function (ECSConfig $config): void {
$config->import('vendor/sylius-labs/coding-standard/ecs.php');
$config->paths([
'src',
'tests',
]);
Expand Down
6 changes: 6 additions & 0 deletions phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
parameters:
level: max
paths:
- bin
- src
- tests
6 changes: 3 additions & 3 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" colors="true">
<coverage includeUncoveredFiles="true" processUncoveredFiles="true">
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd" colors="true" cacheDirectory=".phpunit.cache">
<source>
<include>
<directory suffix=".php">src/</directory>
</include>
</coverage>
</source>
<testsuites>
<testsuite name="Bot Detection Bundle Test Suite">
<directory>tests</directory>
Expand Down
32 changes: 0 additions & 32 deletions psalm.xml
View file
Open in desktop

This file was deleted.

Loading
Loading