Skip to content

Add PHP 8.4 build, run tests with Symfony 7.3 and 7.4, add Symfony 8.0 support #165

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add PHP 8.4 build, run tests with Symfony 7.3 and 7.4, add Symfony 8.0 support #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,26 @@ jobs:
- '8.1'
- '8.2'
- '8.3'
- '8.4'
dependency:
- ''
symfony:
- '5.4.*'
- '6.4.*'
- '7.0.*'
- '7.3.*'
include:
- php: '8.1'
symfony: '5.4.*'
dependency: 'lowest'
- php: '8.4'
symfony: '7.4.*@dev'
dependency: ''
- php: '8.4'
symfony: '8.0.*@dev'
dependency: ''
exclude:
- php: '8.1'
symfony: '7.0.*'
symfony: '7.3.*'
fail-fast: false
steps:
- name: Checkout
Expand Down
2 changes: 0 additions & 2 deletions PhpUnit/AbstractCompilerPassTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;

use PHPUnit\Framework\Attributes\CoversNothing;
use PHPUnit\Framework\Attributes\Test;
use Symfony\Component\DependencyInjection\ContainerBuilder;

Expand All @@ -20,7 +19,6 @@ abstract protected function registerCompilerPass(ContainerBuilder $container): v
* This test will run the compile method.
*/
#[Test]
#[CoversNothing]
final public function compilation_should_not_fail_with_empty_container(): void
{
try {
Expand Down
16 changes: 4 additions & 12 deletions Tests/Fixtures/DependableExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,19 @@
namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\Extension\Extension;

class DependableExtension implements ExtensionInterface
class DependableExtension extends Extension
{
public function load(array $config, ContainerBuilder $container): void
public function load(array $configs, ContainerBuilder $container): void
{
if ($container->hasParameter('parameter_from_non_dependable')) {
$container->setParameter('dependable_parameter', 'dependable value');
}
}

public function getAlias()
public function getAlias(): string
{
return 'dependable';
}

public function getNamespace(): void
{
}

public function getXsdValidationBasePath(): void
{
}
}
16 changes: 4 additions & 12 deletions Tests/Fixtures/MatthiasDependencyInjectionTestExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Reference;

class MatthiasDependencyInjectionTestExtension implements ExtensionInterface
class MatthiasDependencyInjectionTestExtension extends Extension
{
public function load(array $config, ContainerBuilder $container): void
public function load(array $configs, ContainerBuilder $container): void
{
// load some service definitions
$loader = new XmlFileLoader($container, new FileLocator(__DIR__));
Expand Down Expand Up @@ -41,16 +41,8 @@ public function load(array $config, ContainerBuilder $container): void
$container->setDefinition('manual_with_reference', $definition);
}

public function getAlias()
public function getAlias(): string
{
return 'matthias_dependency_injection_test';
}

public function getNamespace(): void
{
}

public function getXsdValidationBasePath(): void
{
}
}
18 changes: 5 additions & 13 deletions Tests/Fixtures/NonDependablePrependableExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,21 @@
namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;

class NonDependablePrependableExtension implements ExtensionInterface, PrependExtensionInterface
class NonDependablePrependableExtension extends Extension implements PrependExtensionInterface
{
public function load(array $config, ContainerBuilder $container): void
public function load(array $configs, ContainerBuilder $container): void
{
}

public function getAlias()
public function getAlias(): string
{
return 'non_dependable';
}

public function getNamespace(): void
{
}

public function getXsdValidationBasePath(): void
{
}

public function prepend(ContainerBuilder $container)
public function prepend(ContainerBuilder $container): void
{
$container->setParameter('parameter_from_non_dependable', 'non-dependable value');
}
Expand Down
16 changes: 4 additions & 12 deletions Tests/Fixtures/NonPrependableTestExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,21 @@
namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\Extension\Extension;

class NonPrependableTestExtension implements ExtensionInterface
class NonPrependableTestExtension extends Extension
{
public function prepend(ContainerBuilder $container): void
{
$container->setParameter('ignored_invocation', 'ignored value');
}

public function load(array $config, ContainerBuilder $container): void
public function load(array $configs, ContainerBuilder $container): void
{
}

public function getAlias()
public function getAlias(): string
{
return 'non_prependable_test';
}

public function getNamespace(): void
{
}

public function getXsdValidationBasePath(): void
{
}
}
16 changes: 4 additions & 12 deletions Tests/Fixtures/PrependableTestExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,22 @@
namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;

class PrependableTestExtension implements ExtensionInterface, PrependExtensionInterface
class PrependableTestExtension extends Extension implements PrependExtensionInterface
{
public function prepend(ContainerBuilder $container): void
{
$container->setParameter('prepend_parameter_set', 'prepended value');
}

public function load(array $config, ContainerBuilder $container): void
public function load(array $configs, ContainerBuilder $container): void
{
}

public function getAlias()
public function getAlias(): string
{
return 'prependable_test';
}

public function getNamespace(): void
{
}

public function getXsdValidationBasePath(): void
{
}
}
16 changes: 4 additions & 12 deletions Tests/Fixtures/SimpleExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,16 @@
namespace Matthias\SymfonyDependencyInjectionTest\Tests\Fixtures;

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
use Symfony\Component\DependencyInjection\Extension\Extension;

class SimpleExtension implements ExtensionInterface
class SimpleExtension extends Extension
{
public function load(array $config, ContainerBuilder $container): void
public function load(array $configs, ContainerBuilder $container): void
{
}

public function getAlias()
public function getAlias(): string
{
return 'simple';
}

public function getNamespace(): void
{
}

public function getXsdValidationBasePath(): void
{
}
}
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"matthiasnoback/symfony-config-test": "^5.0 || ^6.0",
"phpunit/phpunit": "^10.5.11 || ^11.0 || ^12.0",
"sebastian/exporter": " ^5.0 || ^6.0 || ^7.0",
"symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
"symfony/config": "^5.4 || ^6.2 || ^7.0",
"symfony/yaml": "^5.4 || ^6.2 || ^7.0"
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0",
"symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0"
},
"autoload": {
"psr-4" : { "Matthias\\SymfonyDependencyInjectionTest\\" : "" },
Expand All @@ -30,7 +30,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "5.0.x-dev"
"dev-master": "6.x-dev"
}
},
"minimum-stability": "dev",
Expand Down