|
@@ -1,6 +1,6 @@ discard block |
|
|
block discarded – undo |
|
1
|
1
|
<?php |
|
2
|
2
|
|
|
3
|
|
-declare(strict_types = 1); |
|
|
3
|
+declare(strict_types=1); |
|
4
|
4
|
|
|
5
|
5
|
/** |
|
6
|
6
|
* Copyright 2014 SURFnet bv |
|
@@ -53,7 +53,7 @@ discard block |
|
|
block discarded – undo |
|
53
|
53
|
{ |
|
54
|
54
|
$configuration = new Configuration(); |
|
55
|
55
|
$config = $this->processConfiguration($configuration, $configs); |
|
56
|
|
- $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
|
|
56
|
+ $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); |
|
57
|
57
|
$loader->load('services.yml'); |
|
58
|
58
|
|
|
59
|
59
|
foreach ($config['providers'] as $provider => $providerConfiguration) { |
|
@@ -160,7 +160,7 @@ discard block |
|
|
block discarded – undo |
|
160
|
160
|
$hostedDefinition = $this->buildHostedEntityDefinition($provider, $configuration, $routes); |
|
161
|
161
|
$container->setDefinition('gssp.provider.' . $provider . '.hosted_entities', $hostedDefinition); |
|
162
|
162
|
|
|
163
|
|
- $hostedSpDefinition = (new Definition()) |
|
|
163
|
+ $hostedSpDefinition = (new Definition()) |
|
164
|
164
|
->setClass(ServiceProvider::class) |
|
165
|
165
|
->setFactory([ |
|
166
|
166
|
new Reference('gssp.provider.' . $provider . '.hosted_entities'), |
|
@@ -198,7 +198,7 @@ discard block |
|
|
block discarded – undo |
|
198
|
198
|
|
|
199
|
199
|
private function createRemoteDefinition(string $provider, array $configuration, ContainerBuilder $container): void |
|
200
|
200
|
{ |
|
201
|
|
- $definition = new Definition(IdentityProvider::class, [ |
|
|
201
|
+ $definition = new Definition(IdentityProvider::class, [ |
|
202
|
202
|
[ |
|
203
|
203
|
'entityId' => $configuration['entity_id'], |
|
204
|
204
|
'ssoUrl' => $configuration['sso_url'], |
|
@@ -259,14 +259,14 @@ discard block |
|
|
block discarded – undo |
|
259
|
259
|
|
|
260
|
260
|
private function validateDescriptions($descriptions, $appUrl, string $provider, string $type): void |
|
261
|
261
|
{ |
|
262
|
|
- $regex ="/%%{$type}_link_start%%[a-zA-Z0-9 ]+%%{$type}_link_end%%/"; |
|
|
262
|
+ $regex = "/%%{$type}_link_start%%[a-zA-Z0-9 ]+%%{$type}_link_end%%/"; |
|
263
|
263
|
foreach ($descriptions as $lang => $description) { |
|
264
|
264
|
if ($appUrl !== false && preg_match($regex, (string) $description) === 0) { |
|
265
|
265
|
throw new InvalidConfigurationException( |
|
266
|
266
|
sprintf( |
|
267
|
267
|
'You have configured a GSSP provider with app URL\'s but the description is not ' . |
|
268
|
268
|
'configured correctly yet. Missing "%%%1$s_link_start%%" or "%%%1$s_link_end%%" in ' . |
|
269
|
|
- 'GSSP description for language "%2$s" in "providers.%3$s.view_config.description" of '. |
|
|
269
|
+ 'GSSP description for language "%2$s" in "providers.%3$s.view_config.description" of ' . |
|
270
|
270
|
'samlstepupproviders.yml', |
|
271
|
271
|
$type, |
|
272
|
272
|
$lang, |