Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Enum value definitions #859

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

Merged
mnapoli merged 3 commits into from
Aug 10, 2023
Merged

Enum value definitions #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9584ed
Add tests for enum cases as value definitions
zorac Aug 8, 2023
09e3821
Fix #825 by allowing compilation of enum value definitions
zorac Aug 8, 2023
0466e4f
Fix job failures
zorac Aug 8, 2023
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: 2 additions & 1 deletion .php-cs-fixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
'single_line_throw' => false,
'php_unit_method_casing' => false,
'blank_line_between_import_groups' => false,
'global_namespace_import' => false,
'global_namespace_import' => false,
'nullable_type_declaration_for_default_null_value' => false,
])
->setRiskyAllowed(true)
->setFinder($finder);
4 changes: 4 additions & 0 deletions src/Compiler/Compiler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,10 @@ private function isCompilable($value) : string|bool
if ($value instanceof \Closure) {
return true;
}
/** @psalm-suppress UndefinedClass */
if ((\PHP_VERSION_ID >= 80100) && ($value instanceof \UnitEnum)) {
return true;
}
if (is_object($value)) {
return 'An object was found but objects cannot be compiled';
}
Expand Down
12 changes: 12 additions & 0 deletions tests/IntegrationTest/Definitions/ObjectDefinition/Enum1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

declare(strict_types=1);

namespace DI\Test\IntegrationTest\Definitions\ObjectDefinition;

enum Enum1
{
case Foo;
case Bar;
Case Baz;
}
12 changes: 12 additions & 0 deletions tests/IntegrationTest/Definitions/ObjectDefinition/Enum2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?php

declare(strict_types=1);

namespace DI\Test\IntegrationTest\Definitions\ObjectDefinition;

enum Enum2: string
{
case Foo = 'foo';
case Bar = 'bar';
Case Baz = 'baz';
}
24 changes: 24 additions & 0 deletions tests/IntegrationTest/Definitions/ValueDefinitionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

use DI\ContainerBuilder;
use DI\Test\IntegrationTest\BaseContainerTest;
use DI\Test\IntegrationTest\Definitions\ObjectDefinition\Enum1;
use DI\Test\IntegrationTest\Definitions\ObjectDefinition\Enum2;
use stdClass;

/**
Expand Down Expand Up @@ -44,4 +46,26 @@ public function test_value_definitions(ContainerBuilder $builder)
self::assertEntryIsCompiled($container, 'closure');
$this->assertEquals('foo', call_user_func($container->get('closure')));
}

/**
* @dataProvider provideContainer
*/
public function test_enum_value_definitions(ContainerBuilder $builder)
{
if (PHP_VERSION_ID < 80100) {
$this->markTestSkipped("PHP 8.1 required for enum value definitions");
}

$builder->addDefinitions([
'unit_enum' => Enum1::Foo,
'backed_enum' => Enum2::Bar,
]);
$container = $builder->build();

self::assertEntryIsCompiled($container, 'unit_enum');
$this->assertEquals(Enum1::Foo, $container->get('unit_enum'));

self::assertEntryIsCompiled($container, 'backed_enum');
$this->assertEquals(Enum2::Bar, $container->get('backed_enum'));
}
}