Skip to content

Commit 1983c94

Browse files
Merge branch '5.4' into 6.2
* 5.4: [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing >= 6.0 Add warning about Symfony 5.2 changing pcntl_async_signals [Tests] Fix static calls and Mock var annotation [FrameworkBundle] Fix checkboxes check assertions [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null` [HttpClient] Fix over-encoding of URL parts to match browser's behavior Fix Psalm job [HttpClient] Fix data collector [Tests] Migrate tests to static data providers [Semaphore] Fix test Fix: Split and clean up tests Remove unused data provider add Sender to the list of bypassed headers
2 parents 0753a08 + 4c34262 commit 1983c94

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

Tests/Authorization/Strategy/AffirmativeStrategyTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ public function provideStrategyTests(): iterable
2020
{
2121
$strategy = new AffirmativeStrategy();
2222

23-
yield [$strategy, static::getVoters(1, 0, 0), true];
24-
yield [$strategy, static::getVoters(1, 2, 0), true];
25-
yield [$strategy, static::getVoters(0, 1, 0), false];
26-
yield [$strategy, static::getVoters(0, 0, 1), false];
23+
yield [$strategy, self::getVoters(1, 0, 0), true];
24+
yield [$strategy, self::getVoters(1, 2, 0), true];
25+
yield [$strategy, self::getVoters(0, 1, 0), false];
26+
yield [$strategy, self::getVoters(0, 0, 1), false];
2727

2828
$strategy = new AffirmativeStrategy(true);
2929

30-
yield [$strategy, static::getVoters(0, 0, 1), true];
30+
yield [$strategy, self::getVoters(0, 0, 1), true];
3131
}
3232
}

Tests/Authorization/Strategy/ConsensusStrategyTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ public function provideStrategyTests(): iterable
2020
{
2121
$strategy = new ConsensusStrategy();
2222

23-
yield [$strategy, static::getVoters(1, 0, 0), true];
24-
yield [$strategy, static::getVoters(1, 2, 0), false];
25-
yield [$strategy, static::getVoters(2, 1, 0), true];
26-
yield [$strategy, static::getVoters(0, 0, 1), false];
23+
yield [$strategy, self::getVoters(1, 0, 0), true];
24+
yield [$strategy, self::getVoters(1, 2, 0), false];
25+
yield [$strategy, self::getVoters(2, 1, 0), true];
26+
yield [$strategy, self::getVoters(0, 0, 1), false];
2727

28-
yield [$strategy, static::getVoters(2, 2, 0), true];
29-
yield [$strategy, static::getVoters(2, 2, 1), true];
28+
yield [$strategy, self::getVoters(2, 2, 0), true];
29+
yield [$strategy, self::getVoters(2, 2, 1), true];
3030

3131
$strategy = new ConsensusStrategy(true);
3232

33-
yield [$strategy, static::getVoters(0, 0, 1), true];
33+
yield [$strategy, self::getVoters(0, 0, 1), true];
3434

3535
$strategy = new ConsensusStrategy(false, false);
3636

37-
yield [$strategy, static::getVoters(2, 2, 0), false];
38-
yield [$strategy, static::getVoters(2, 2, 1), false];
37+
yield [$strategy, self::getVoters(2, 2, 0), false];
38+
yield [$strategy, self::getVoters(2, 2, 1), false];
3939
}
4040
}

Tests/Authorization/Strategy/PriorityStrategyTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ public function provideStrategyTests(): iterable
2222
$strategy = new PriorityStrategy();
2323

2424
yield [$strategy, [
25-
static::getVoter(VoterInterface::ACCESS_ABSTAIN),
26-
static::getVoter(VoterInterface::ACCESS_GRANTED),
27-
static::getVoter(VoterInterface::ACCESS_DENIED),
28-
static::getVoter(VoterInterface::ACCESS_DENIED),
25+
self::getVoter(VoterInterface::ACCESS_ABSTAIN),
26+
self::getVoter(VoterInterface::ACCESS_GRANTED),
27+
self::getVoter(VoterInterface::ACCESS_DENIED),
28+
self::getVoter(VoterInterface::ACCESS_DENIED),
2929
], true];
3030

3131
yield [$strategy, [
32-
static::getVoter(VoterInterface::ACCESS_ABSTAIN),
33-
static::getVoter(VoterInterface::ACCESS_DENIED),
34-
static::getVoter(VoterInterface::ACCESS_GRANTED),
35-
static::getVoter(VoterInterface::ACCESS_GRANTED),
32+
self::getVoter(VoterInterface::ACCESS_ABSTAIN),
33+
self::getVoter(VoterInterface::ACCESS_DENIED),
34+
self::getVoter(VoterInterface::ACCESS_GRANTED),
35+
self::getVoter(VoterInterface::ACCESS_GRANTED),
3636
], false];
3737

38-
yield [$strategy, static::getVoters(0, 0, 2), false];
38+
yield [$strategy, self::getVoters(0, 0, 2), false];
3939

4040
$strategy = new PriorityStrategy(true);
4141

42-
yield [$strategy, static::getVoters(0, 0, 2), true];
42+
yield [$strategy, self::getVoters(0, 0, 2), true];
4343
}
4444
}

Tests/Authorization/Strategy/UnanimousStrategyTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public function provideStrategyTests(): iterable
2020
{
2121
$strategy = new UnanimousStrategy();
2222

23-
yield [$strategy, static::getVoters(1, 0, 0), true];
24-
yield [$strategy, static::getVoters(1, 0, 1), true];
25-
yield [$strategy, static::getVoters(1, 1, 0), false];
23+
yield [$strategy, self::getVoters(1, 0, 0), true];
24+
yield [$strategy, self::getVoters(1, 0, 1), true];
25+
yield [$strategy, self::getVoters(1, 1, 0), false];
2626

27-
yield [$strategy, static::getVoters(0, 0, 2), false];
27+
yield [$strategy, self::getVoters(0, 0, 2), false];
2828

2929
$strategy = new UnanimousStrategy(true);
3030

31-
yield [$strategy, static::getVoters(0, 0, 2), true];
31+
yield [$strategy, self::getVoters(0, 0, 2), true];
3232
}
3333
}

0 commit comments

Comments
 (0)