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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ jobs:
- '6.3.*'
- '6.4.*'
- '7.0.*'
include:
- php: '8.4'
symfony: '8.0.*'
exclude:
- php: '7.2'
symfony: '6.0.*'
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
],
"require": {
"php": "^7.2.5 || ^8.0",
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
"symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/filesystem": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0 || ^8.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^8.5 || ^9.4"
Expand All @@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "3.x-dev"
}
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/TestKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ public function __construct(string $environment, bool $debug)
}

/**
* @psalm-param class-string<BundleInterface> $bundleClassName
*
* @param string $bundleClassName
*
* @psalm-param class-string<BundleInterface> $bundleClassName
*/
public function addTestBundle($bundleClassName): void
{
Expand Down
4 changes: 4 additions & 0 deletions src/config/parameters.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<?php

if (!method_exists('Symfony\Component\DependencyInjection\ContainerBuilder', 'getAutoconfiguredAttributes')) {
return; // Symfony 8
}

// If annotations aren't installed, disable it.
if (!class_exists('Doctrine\Common\Annotations\Annotation')) {
$container->loadFromExtension('framework', [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class DeRegisterSomethingPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
public function process(ContainerBuilder $container): void
{
if ($container->hasDefinition('something')) {
$container->removeDefinition('something');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

class RegisterSomethingPass implements CompilerPassInterface
{
public function process(ContainerBuilder $container)
public function process(ContainerBuilder $container): void
{
if ($container->hasDefinition('something')) {
return;
Expand Down
1 change: 0 additions & 1 deletion tests/Functional/BundleShutdownTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public function testCleanupTemporaryDirectories(): void
$filesystem = new Filesystem();

self::assertTrue($filesystem->exists($cacheDirectory));
self::assertTrue($filesystem->exists($logDirectory));

self::ensureKernelShutdown();

Expand Down