Skip to content
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.

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

feat: PHP 8.4 #507

Merged
merged 11 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
name: Build and test
strategy:
matrix:
php: [8.1, 8.2, 8.3]
php: [8.1, 8.2, 8.3, 8.4]
deps: [high]
include:
- php: 8.1
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
needs: tests
strategy:
matrix:
php: [8.1, 8.2, 8.3]
php: [8.1, 8.2, 8.3, 8.4]

steps:
- uses: actions/checkout@v4
Expand All @@ -79,10 +79,9 @@ jobs:
with:
name: toolbox.phar
path: build/

- run: make test-integration
env:
GITHUB_AUTH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-phars:
runs-on: ubuntu-latest
Expand Down
163 changes: 81 additions & 82 deletions README.md

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions bin/devkit.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
$readmePath = $input->getOption('readme');
$tools = $this->loadTools($jsonPath);

$toolsList = '| Name | Description | PHP 8.1 | PHP 8.2 | PHP 8.3 |' . PHP_EOL;
$toolsList .= '| :--- | :---------- | :------ | :------ | :------ |' . PHP_EOL;
$toolsList = '| Name | Description | PHP 8.1 | PHP 8.2 | PHP 8.3 | PHP 8.4 |' . PHP_EOL;
$toolsList .= '| :--- | :---------- | :------ | :------ | :------ | :------ |' . PHP_EOL;
$toolsList .= $tools->sort(function (Tool $left, Tool $right) {
return strcasecmp($left->name(), $right->name());
})->reduce('', function ($acc, Tool $tool) {

return $acc . sprintf('| %s | [%s](%s) | %s | %s | %s |',
return $acc . sprintf('| %s | [%s](%s) | %s | %s | %s | %s |',
$tool->name(),
$tool->summary(),
$tool->website(),
in_array('exclude-php:8.1', $tool->tags(), true) ? '❌' : '✅',
in_array('exclude-php:8.2', $tool->tags(), true) ? '❌' : '✅',
in_array('exclude-php:8.3', $tool->tags(), true) ? '❌' : '✅'
in_array('exclude-php:8.3', $tool->tags(), true) ? '❌' : '✅',
in_array('exclude-php:8.4', $tool->tags(), true) ? '❌' : '✅',
) . PHP_EOL;
});

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Helps to discover and install tools",
"type": "project",
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this code and the one in devkit, we could extract the supported PHP versions from composer.json here instead of hardcoding it, probably also generate the Github actions YAML file.

"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"symfony/console": "^5.4.31 || ^6.3",
"psr/container": "^2.0"
},
Expand Down
14 changes: 0 additions & 14 deletions resources/architecture.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,6 @@
"test": "pdepend --version",
"tags": ["featured", "architecture"]
},
{
"name": "php-coupling-detector",
"summary": "Detects code coupling issues",
"website": "https://akeneo.github.io/php-coupling-detector/",
"command": {
"composer-bin-plugin": {
"package": "akeneo/php-coupling-detector",
"namespace": "tools",
"links": {"%target-dir%/php-coupling-detector": "php-coupling-detector"}
}
},
"test": "php-coupling-detector list",
"tags": ["exclude-php:8.1", "exclude-php:8.2", "exclude-php:8.3", "architecture"]
dkarlovi marked this conversation as resolved.
Show resolved Hide resolved
},
{
"name": "phparkitect",
"summary": "Helps to put architectural constraints in a PHP code base",
Expand Down
2 changes: 1 addition & 1 deletion resources/checkstyle.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}
},
"test": "php-cs-fixer list",
"tags": ["featured", "checkstyle"]
"tags": ["featured", "checkstyle", "exclude-php:8.4"]
},
{
"name": "phpcbf",
Expand Down
2 changes: 1 addition & 1 deletion resources/compatibility.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}
},
"test": "roave-backward-compatibility-check --version",
"tags": ["compatibility"]
"tags": ["compatibility", "exclude-php:8.4"]
}
]
}
2 changes: 1 addition & 1 deletion resources/test.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
}
},
"test": "phpspec --version",
"tags": ["exclude-php:8.3", "exclude-php:8.2", "featured", "test"]
"tags": ["exclude-php:8.4", "exclude-php:8.3", "exclude-php:8.2", "featured", "test"]
},
{
"name": "phpunit",
Expand Down
Loading