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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
fail-fast: false
matrix:
include:
- { php-version: 8.1, symfony-locked-version: 5.4.*, dependency-version: prefer-stable }
- { php-version: 8.1, symfony-locked-version: 6.4.*, dependency-version: prefer-stable }
- { php-version: 8.3, symfony-locked-version: 6.4.*, dependency-version: prefer-stable }
- { php-version: 8.3, symfony-locked-version: 7.4.*, dependency-version: prefer-stable }
name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})
steps:
- uses: actions/checkout@v4
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
"lib-icu": ">=4.8",
"jms/parser-lib": "^1.0.0",
"psr/log": "^1.0",
"symfony/config": "^5.0|^6.0",
"symfony/dependency-injection": "^5.0|^6.0",
"symfony/finder": "^5.0|^6.0",
"symfony/framework-bundle": "^5.0|^6.0",
"symfony/http-kernel": "^5.0|^6.0",
"symfony/translation": "^5.0|^6.0",
"symfony/config": "^6.0|^7.0",
"symfony/dependency-injection": "^6.0|^7.0",
"symfony/finder": "^6.0|^7.0",
"symfony/framework-bundle": "^6.0|^7.0",
"symfony/http-kernel": "^6.0|^7.0",
"symfony/translation": "^6.0|^7.0",
"symfony/translation-contracts": "^2.0|^3.0",
"twig/twig": "^1.42|^2.0|^3.0"
},
"require-dev": {
"phpunit/phpunit": "^8.5 | ^9.0",
"symfony/monolog-bundle": "^3.4.31",
"symfony/phpunit-bridge": ">= 5.0",
"symfony/twig-bundle": "^3.4.31|^4.0|^5.0",
"symfony/yaml": "^4.4|^5.0"
"symfony/phpunit-bridge": "^6.0|^7.0",
"symfony/twig-bundle": "^6.0|^7.0",
"symfony/yaml": "^6.0|^7.0"
},
"autoload": {
"psr-4": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
*/
class WebfactoryIcuTranslationExtension extends Extension
{
/**
* Adds service definitions to the container.
*
* @param array(string) $config
*/
public function load(array $config, ContainerBuilder $container)
public function load(array $configs, ContainerBuilder $container): void
{
$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
$loader->load('services.yml');
Expand Down
1 change: 1 addition & 0 deletions tests/Fixtures/config/config.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
framework:
secret: dont-tell-mum
test: true
6 changes: 1 addition & 5 deletions tests/Functional/TwigExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@ class TwigExtensionTest extends KernelTestCase
protected function setUp(): void
{
parent::setUp();

$kernel = static::bootKernel();
$container = $kernel->getContainer();

$this->twig = $container->get('twig');
$this->twig = self::getContainer()->get('twig');
}

/**
Expand Down
Loading