Skip to content

Commit fab50ce

Browse files
Merge branch '2.8' into 3.4
* 2.8: [php_cs] disable fopen_flags [CS] Remove unused variables passed to closures [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 updated CHANGELOG for 2.8.46
2 parents 85728f9 + 32be667 commit fab50ce

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

DependencyInjection/Security/Factory/GuardAuthenticationFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@ private function determineEntryPoint($defaultEntryPointId, array $config)
115115
}
116116

117117
// we have multiple entry points - we must ask them to configure one
118-
throw new \LogicException(sprintf('Because you have multiple guard configurators, you need to set the "guard.entry_point" key to one of your configurators (%s)', implode(', ', $authenticatorIds)));
118+
throw new \LogicException(sprintf('Because you have multiple guard authenticators, you need to set the "guard.entry_point" key to one of your authenticators (%s)', implode(', ', $authenticatorIds)));
119119
}
120120
}

Tests/DependencyInjection/CompleteConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ public function testFirewallListenerWithProvider()
594594

595595
protected function getContainer($file)
596596
{
597-
$file = $file.'.'.$this->getFileExtension();
597+
$file .= '.'.$this->getFileExtension();
598598

599599
$container = new ContainerBuilder();
600600
$security = new SecurityExtension();

0 commit comments

Comments
 (0)