From 6e54aff3ffe12d476bdd7b238bb971a6df41a9ad Mon Sep 17 00:00:00 2001 From: Tim van Dijen <tvdijen@gmail.com> Date: Sun, 12 Aug 2018 01:05:10 +0200 Subject: [PATCH] Fix namespace-issue I had to rename the class because 'static' is a protected keyword, but forgot to rename the file --- .../lib/Auth/Source/StaticSource.php | 80 ++++++++++--------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/modules/exampleauth/lib/Auth/Source/StaticSource.php b/modules/exampleauth/lib/Auth/Source/StaticSource.php index d81dd3256..ca17a378c 100644 --- a/modules/exampleauth/lib/Auth/Source/StaticSource.php +++ b/modules/exampleauth/lib/Auth/Source/StaticSource.php @@ -14,42 +14,46 @@ namespace SimpleSAML\Module\exampleauth\Auth\Source; class StaticSource extends \SimpleSAML\Auth\Source { - /** - * The attributes we return. - */ - private $attributes; - - /** - * Constructor for this authentication source. - * - * @param array $info Information about this authentication source. - * @param array $config Configuration. - */ - public function __construct($info, $config) - { - assert(is_array($info)); - assert(is_array($config)); - - // Call the parent constructor first, as required by the interface - parent::__construct($info, $config); - - // Parse attributes - try { - $this->attributes = \SimpleSAML\Utils\Attributes::normalizeAttributesArray($config); - } catch (\Exception $e) { - throw new \Exception('Invalid attributes for authentication source '. - $this->authId.': '.$e->getMessage()); - } - } - - /** - * Log in using static attributes. - * - * @param array &$state Information about the current authentication. - */ - public function authenticate(&$state) - { - assert(is_array($state)); - $state['Attributes'] = $this->attributes; - } + /** + * The attributes we return. + */ + private $attributes; + + + /** + * Constructor for this authentication source. + * + * @param array $info Information about this authentication source. + * @param array $config Configuration. + */ + public function __construct($info, $config) { + assert(is_array($info)); + assert(is_array($config)); + + // Call the parent constructor first, as required by the interface + parent::__construct($info, $config); + + + // Parse attributes + try { + $this->attributes = \SimpleSAML\Utils\Attributes::normalizeAttributesArray($config); + } catch (\Exception $e) { + throw new \Exception('Invalid attributes for authentication source ' . + $this->authId . ': ' . $e->getMessage()); + } + + } + + + /** + * Log in using static attributes. + * + * @param array &$state Information about the current authentication. + */ + public function authenticate(&$state) { + assert(is_array($state)); + + $state['Attributes'] = $this->attributes; + } + } -- GitLab