Skip to content

Commit 9865bd2

Browse files
JulienRAVIAJulienRAVIA
committed
wip
1 parent 08ac861 commit 9865bd2

File tree

11 files changed

+124
-203
lines changed

11 files changed

+124
-203
lines changed

‎.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
php-version:
13-
- "7.4"
13+
- "8.2"
1414

1515
steps:
1616
- name: "Checkout"

‎.github/workflows/continuous-integration.yml

Lines changed: 12 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ jobs:
1616
strategy:
1717
matrix:
1818
php-version:
19-
- "7.4"
20-
- "8.0"
21-
- "8.1"
2219
- "8.2"
2320
deps:
2421
- "normal"
@@ -27,113 +24,53 @@ jobs:
2724
symfony-deprecations-helper:
2825
- ""
2926
include:
30-
# Test against latest Symfony 5.4 stable on 7.4
31-
- symfony-require: "5.4.*"
32-
php-version: "7.4"
33-
deps: "dev"
34-
35-
# Test against latest Symfony 5.4 stable on 7.4 deps normal
36-
- symfony-require: "5.4.*"
37-
php-version: "7.4"
38-
deps: "normal"
39-
40-
# Test against latest Symfony 5.4 stable on 8.0
41-
- symfony-require: "5.4.*"
42-
php-version: "8.0"
43-
deps: "dev"
44-
45-
# Test against latest Symfony 5.4 stable on 8.0 deps normal
46-
- symfony-require: "5.4.*"
47-
php-version: "8.0"
48-
deps: "normal"
49-
50-
# Test against latest Symfony 5.4 stable on 8.1
51-
- symfony-require: "5.4.*"
52-
php-version: "8.1"
53-
deps: "dev"
54-
55-
# Test against latest Symfony 5.4 stable on 8.1 deps normal
56-
- symfony-require: "5.4.*"
57-
php-version: "8.1"
58-
deps: "normal"
59-
60-
# Test against latest Symfony 5.4 stable on 8.2
61-
- symfony-require: "5.4.*"
62-
php-version: "8.2"
63-
deps: "dev"
64-
65-
# Test against latest Symfony 5.4 stable on 8.2 deps normal
66-
- symfony-require: "5.4.*"
67-
php-version: "8.2"
68-
deps: "normal"
69-
70-
# Test against latest Symfony 6.0 stable on 8.0
71-
- symfony-require: "6.0.*"
72-
php-version: "8.0"
73-
deps: "dev"
74-
75-
# Test against latest Symfony 6.0 stable on 8.0 deps normal
76-
- symfony-require: "6.0.*"
77-
php-version: "8.0"
78-
deps: "normal"
79-
80-
# Test against latest Symfony 6.0 stable on 8.1
81-
- symfony-require: "6.0.*"
82-
php-version: "8.1"
83-
deps: "dev"
84-
85-
# Test against latest Symfony 6.0 stable on 8.1 deps normal
86-
- symfony-require: "6.0.*"
87-
php-version: "8.1"
88-
deps: "normal"
89-
9027
# Test against latest Symfony 6.0 stable on 8.2
91-
- symfony-require: "6.0.*"
28+
- symfony-require: "7.0.*"
9229
php-version: "8.2"
9330
deps: "dev"
9431

9532
# Test against latest Symfony 6.0 stable on 8.2 deps normal
96-
- symfony-require: "6.0.*"
33+
- symfony-require: "7.0.*"
9734
php-version: "8.2"
9835
deps: "normal"
9936

10037
# Test against latest Symfony 6.1 stable on 8.1
101-
- symfony-require: "6.1.*"
38+
- symfony-require: "7.1.*"
10239
php-version: "8.1"
10340
deps: "dev"
10441

10542
# Test against latest Symfony 6.1 stable on 8.1 deps normal
106-
- symfony-require: "6.1.*"
43+
- symfony-require: "7.1.*"
10744
php-version: "8.1"
10845
deps: "normal"
10946

11047
# Test against latest Symfony 6.1 stable on 8.2
111-
- symfony-require: "6.1.*"
48+
- symfony-require: "7.1.*"
11249
php-version: "8.2"
11350
deps: "dev"
11451

11552
# Test against latest Symfony 6.1 stable on 8.2 deps normal
116-
- symfony-require: "6.1.*"
53+
- symfony-require: "7.1.*"
11754
php-version: "8.2"
11855
deps: "normal"
11956

12057
# Test against latest Symfony 6.2 stable on 8.1
121-
- symfony-require: "6.2.*"
122-
php-version: "8.1"
58+
- symfony-require: "7.2.*"
59+
php-version: "8.2"
12360
deps: "dev"
12461

12562
# Test against latest Symfony 6.2 stable on 8.1 deps normal
126-
- symfony-require: "6.2.*"
127-
php-version: "8.1"
63+
- symfony-require: "7.2.*"
64+
php-version: "8.2"
12865
deps: "normal"
12966

13067
# Test against latest Symfony 6.2 stable on 8.2
131-
- symfony-require: "6.2.*"
68+
- symfony-require: "7.2.*"
13269
php-version: "8.2"
13370
deps: "dev"
13471

13572
# Test against latest Symfony 6.2 stable on 8.2 deps normal
136-
- symfony-require: "6.2.*"
73+
- symfony-require: "7.2.*"
13774
php-version: "8.2"
13875
deps: "normal"
13976
steps:

‎DependencyInjection/Configuration.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Psr\Http\Message\UriFactoryInterface;
1111
use Psr\Log\LoggerInterface;
1212
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
13+
use Symfony\Component\Config\Definition\Builder\NodeBuilder;
1314
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
1415
use Symfony\Component\Config\Definition\ConfigurationInterface;
1516
use Tmdb\Client;
@@ -20,7 +21,6 @@
2021
use Tmdb\Formatter\Hydration\SimpleHydrationFormatter;
2122
use Tmdb\Formatter\TmdbApiException\SimpleTmdbApiExceptionFormatter;
2223

23-
2424
class Configuration implements ConfigurationInterface
2525
{
2626
/**
@@ -29,9 +29,13 @@ class Configuration implements ConfigurationInterface
2929
public function getConfigTreeBuilder(): TreeBuilder
3030
{
3131
$treeBuilder = new TreeBuilder('tmdb_symfony');
32-
/** @var ArrayNodeDefinition $rootNode */
32+
3333
$rootNode = $treeBuilder->getRootNode();
3434

35+
if (!$rootNode instanceof ArrayNodeDefinition) {
36+
return $treeBuilder;
37+
}
38+
3539
$this->addRootChildren($rootNode);
3640
$this->addOptionsSection($rootNode);
3741
$this->addLogSection($rootNode);
@@ -45,7 +49,7 @@ private function addRootChildren(ArrayNodeDefinition $rootNode): void
4549
$rootNode
4650
->beforeNormalization()
4751
->ifTrue(function ($v) {
48-
return isset($v['api_key']) && !empty($v['api_key']);
52+
return !empty($v['api_key']);
4953
})
5054
->then(function ($v) {
5155
$v['options']['api_token'] = $v['api_key'];

‎Tests/DependencyInjection/CompilerPass/ConfigurationPassTest.php

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@
1515
use Tmdb\SymfonyBundle\TmdbSymfonyBundle;
1616
use Tmdb\Token\Api\ApiToken;
1717
use Tmdb\Token\Api\BearerToken;
18+
use PHPUnit\Framework\Attributes as PHPUnit;
1819

1920
final class ConfigurationPassTest extends TestCase
2021
{
21-
/**
22-
* @test
23-
* @group DependencyInjection
24-
*/
25-
public function testProcessFullConfiguration()
22+
private const DEPENDENCY_INJECTION_GROUP = 'DependencyInjection';
23+
24+
#[PHPUnit\Group(self::DEPENDENCY_INJECTION_GROUP)]
25+
#[PHPUnit\Test]
26+
public function testProcessFullConfiguration(): void
2627
{
2728
$container = $this->createFullConfiguration();
2829
$this->registerBasicServices($container);
@@ -33,11 +34,9 @@ public function testProcessFullConfiguration()
3334
$this->doBasicAssertionsBasedOnFullOrMinimalConfig($container);
3435
}
3536

36-
/**
37-
* @test
38-
* @group DependencyInjection
39-
*/
40-
public function testProcessMinimalConfiguration()
37+
#[PHPUnit\Group(self::DEPENDENCY_INJECTION_GROUP)]
38+
#[PHPUnit\Test]
39+
public function testProcessMinimalConfiguration(): void
4140
{
4241
$container = $this->createMinimalConfiguration();
4342
$this->registerBasicServices($container);
@@ -48,11 +47,9 @@ public function testProcessMinimalConfiguration()
4847
$this->doBasicAssertionsBasedOnFullOrMinimalConfig($container);
4948
}
5049

51-
/**
52-
* @test
53-
* @group DependencyInjection
54-
*/
55-
public function testAutowiring()
50+
#[PHPUnit\Group(self::DEPENDENCY_INJECTION_GROUP)]
51+
#[PHPUnit\Test]
52+
public function testAutowiring(): void
5653
{
5754
$container = new ContainerBuilder();
5855

@@ -89,11 +86,9 @@ public function testAutowiring()
8986
$this->assertTag($container, get_class($uriFactoryMock), TmdbSymfonyBundle::PSR17_URI_FACTORIES);
9087
}
9188

92-
/**
93-
* @test
94-
* @group DependencyInjection
95-
*/
96-
public function testAutowiringFailsWithUndiscoveredServices()
89+
#[PHPUnit\Group(self::DEPENDENCY_INJECTION_GROUP)]
90+
#[PHPUnit\Test]
91+
public function testAutowiringFailsWithUndiscoveredServices(): void
9792
{
9893
$this->expectException(\RuntimeException::class);
9994
$container = new ContainerBuilder();
@@ -106,11 +101,9 @@ public function testAutowiringFailsWithUndiscoveredServices()
106101
$pass->process($container);
107102
}
108103

109-
/**
110-
* @test
111-
* @group DependencyInjection
112-
*/
113-
public function testAutowiringFailsWithSeveralDiscoveredServices()
104+
#[PHPUnit\Group(self::DEPENDENCY_INJECTION_GROUP)]
105+
#[PHPUnit\Test]
106+
public function testAutowiringFailsWithSeveralDiscoveredServices(): void
114107
{
115108
$this->expectException(\RuntimeException::class);
116109

@@ -131,11 +124,9 @@ public function testAutowiringFailsWithSeveralDiscoveredServices()
131124
$pass->process($container);
132125
}
133126

134-
/**
135-
* @test
136-
* @group DependencyInjection
137-
*/
138-
public function testProcessBearerToken()
127+
#[PHPUnit\Group(self::DEPENDENCY_INJECTION_GROUP)]
128+
#[PHPUnit\Test]
129+
public function testProcessBearerToken(): void
139130
{
140131
$config = $this->getFullConfig();
141132
$config['options']['bearer_token'] = 'bearer_token';
@@ -146,7 +137,7 @@ public function testProcessBearerToken()
146137
$pass = new ConfigurationPass();
147138
$pass->process($container);
148139

149-
$this->assertEquals(
140+
$this->assertSame(
150141
BearerToken::class,
151142
$container->getDefinition('Tmdb\SymfonyBundle\ClientConfiguration')->getArgument(0)->__toString()
152143
);
@@ -189,7 +180,7 @@ protected function assertClientConfigurationEquals(
189180
string $expectedServiceId,
190181
int $argument
191182
) {
192-
$this->assertEquals(
183+
$this->assertSame(
193184
$expectedServiceId,
194185
$container->getDefinition('Tmdb\SymfonyBundle\ClientConfiguration')->getArgument($argument)->__toString()
195186
);

0 commit comments

Comments
 (0)