Skip to content
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
18 changes: 8 additions & 10 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
- name: Setup PHP
uses: shivammathur/setup-php@v2
- name: Validate composer.json
Expand All @@ -21,7 +21,7 @@ jobs:
name: PHP-CS-Fixer
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
- name: Fix CS
uses: docker://oskarstark/php-cs-fixer-ga
with:
Expand All @@ -32,8 +32,6 @@ jobs:
fail-fast: false
matrix:
include:
- description: 'No Symfony specified'
php: '8.1'
- description: 'No Symfony specified'
php: '8.2'
- description: 'No Symfony specified'
Expand All @@ -43,21 +41,21 @@ jobs:
- description: 'No Symfony specified'
php: '8.5'
- description: 'Lowest deps'
php: '8.1'
php: '8.2'
dependencies: lowest
- description: 'Symfony 6.4'
php: '8.1'
php: '8.2'
symfony: 6.4.*
- description: 'Symfony 7.4'
php: '8.2'
php: '8.3'
symfony: 7.4.*
- description: 'Dev deps'
php: '8.5'
php: '8.6'
dev: true
name: PHP ${{ matrix.php }} tests (${{ matrix.description }})
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -67,7 +65,7 @@ jobs:
run: composer config minimum-stability dev
if: matrix.dev
- name: Install dependencies
uses: ramsey/composer-install@v3
uses: ramsey/composer-install@v4
with:
dependency-versions: ${{ matrix.dependencies }}
env:
Expand Down
4 changes: 2 additions & 2 deletions .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'@PHP71Migration:risky' => true,
'@PHPUnit75Migration:risky' => true,
'@PHP8x2Migration' => true,
'@PHPUnit10x0Migration:risky' => true,
'ordered_imports' => true,
'declare_strict_types' => false,
'native_function_invocation' => ['include' => ['@internal']],
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
}
],
"require": {
"php": "^8.1",
"php": "^8.2",
"knplabs/knp-menu": "^3.8",
"symfony/config": "^6.4 | ^7.0 | ^8.0",
"symfony/dependency-injection": "^6.4 | ^7.0 | ^8.0",
"symfony/deprecation-contracts": "^2.5 | ^3.3",
"symfony/http-kernel": "^6.4 | ^7.0 | ^8.0"
"symfony/config": "^6.4 || ^7.4 || ^8.0",
Comment thread
garak marked this conversation as resolved.
"symfony/dependency-injection": "^6.4 || ^7.4 || ^8.0",
"symfony/deprecation-contracts": "^2.5 || ^3.3",
"symfony/http-kernel": "^6.4 || ^7.4 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^10.5 | ^11.5 | ^12.4",
"symfony/expression-language": "^6.4 | ^7.0 | ^8.0",
"symfony/phpunit-bridge": "^7.0 | ^8.0",
"symfony/templating": "^6.4 | ^7.0 | ^8.0"
"phpunit/phpunit": "^11.5 || ^12.5 || ^13.2",
"symfony/expression-language": "^6.4 || ^7.4 || ^8.0",
"symfony/phpunit-bridge": "^7.4 || ^8.0",
"symfony/templating": "^6.4 || ^7.4 || ^8.0"
},
"autoload": {
"psr-4": { "Knp\\Bundle\\MenuBundle\\": "src" }
Expand Down
2 changes: 1 addition & 1 deletion src/Provider/BuilderAliasProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function get(string $name, array $options = []): ItemInterface
throw new \InvalidArgumentException(\sprintf('Invalid pattern passed to AliasProvider - expected "bundle:class:method", got "%s".', $name));
}

list($bundleName, $className, $methodName) = \explode(':', $name);
[$bundleName, $className, $methodName] = \explode(':', $name);

$builder = $this->getBuilder($bundleName, $className);
if (!\method_exists($builder, $methodName)) {
Expand Down
10 changes: 5 additions & 5 deletions tests/DependencyInjection/ConfigurationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ public static function getConfigs(): array
return [
['<config xmlns="http://knplabs.com/schema/dic/menu"/>'],
[<<<EOC
<config xmlns="http://knplabs.com/schema/dic/menu" templating="true" route-voter="false" default-renderer="templating">
<providers builder-alias="false" container-aware="false" builder-service="false"/>
<twig template="custom.html.twig"/>
</config>
EOC
<config xmlns="http://knplabs.com/schema/dic/menu" templating="true" route-voter="false" default-renderer="templating">
<providers builder-alias="false" container-aware="false" builder-service="false"/>
<twig template="custom.html.twig"/>
</config>
EOC
],
];
}
Expand Down