Skip to content
Snippets Groups Projects
Unverified Commit 742bed03 authored by Zvonimir Mance's avatar Zvonimir Mance Committed by GitHub
Browse files

Fix accidentally removed line

parent ed879726
No related branches found
No related tags found
No related merge requests found
...@@ -295,8 +295,8 @@ class MetaDataStorageHandler implements ClearableState ...@@ -295,8 +295,8 @@ class MetaDataStorageHandler implements ClearableState
* This function looks up the metadata for the given entity id in the given set. It will throw an * This function looks up the metadata for the given entity id in the given set. It will throw an
* exception if it is unable to locate the metadata. * exception if it is unable to locate the metadata.
* *
* @param string|null $entityId The entity id we are looking up. This parameter may be NULL, in which case we look up * @param string|null $entityId The entity id we are looking up. This parameter may be NULL,
* the current entity id based on the current hostname/path. * in which case we look up the current entity id based on the current hostname/path.
* @param string $set The set of metadata we are looking up the entity id in. * @param string $set The set of metadata we are looking up the entity id in.
* *
* @return array The metadata array describing the specified entity. * @return array The metadata array describing the specified entity.
......
...@@ -287,7 +287,9 @@ class MDQ extends \SimpleSAML\Metadata\MetaDataStorageSource ...@@ -287,7 +287,9 @@ class MDQ extends \SimpleSAML\Metadata\MetaDataStorageSource
$data = self::getParsedSet($entity, $set); $data = self::getParsedSet($entity, $set);
if ($data === null) { if ($data === null) {
throw new \Exception(__CLASS__ . ': no metadata for set "' . $set . '" available from "' . $entityId . '".'); throw new \Exception(
__CLASS__ . ': no metadata for set "' . $set . '" available from "' . $entityId . '".'
);
} }
try { try {
......
...@@ -58,6 +58,7 @@ class PHP extends Auth\ProcessingFilter ...@@ -58,6 +58,7 @@ class PHP extends Auth\ProcessingFilter
* @param array &$attributes * @param array &$attributes
* @param array &$state * @param array &$state
*/ */
$function = function (
/** @scrutinizer ignore-unused */ array &$attributes, /** @scrutinizer ignore-unused */ array &$attributes,
/** @scrutinizer ignore-unused */ array &$state /** @scrutinizer ignore-unused */ array &$state
) { ) {
......
...@@ -589,7 +589,7 @@ class SP extends \SimpleSAML\Auth\Source ...@@ -589,7 +589,7 @@ class SP extends \SimpleSAML\Auth\Source
// Otherwise use extensions that might be defined in the local SP (only makes sense in a proxy scenario) // Otherwise use extensions that might be defined in the local SP (only makes sense in a proxy scenario)
if (isset($state['saml:Extensions']) && count($state['saml:Extensions']) > 0) { if (isset($state['saml:Extensions']) && count($state['saml:Extensions']) > 0) {
$ar->setExtensions($state['saml:Extensions']); $ar->setExtensions($state['saml:Extensions']);
} else if ($this->metadata->getArray('saml:Extensions', null) !== null) { } elseif ($this->metadata->getArray('saml:Extensions', null) !== null) {
$ar->setExtensions($this->metadata->getArray('saml:Extensions')); $ar->setExtensions($this->metadata->getArray('saml:Extensions'));
} }
......
...@@ -54,6 +54,7 @@ class RedisTest extends TestCase ...@@ -54,6 +54,7 @@ class RedisTest extends TestCase
$this->mocked_redis->method('del') $this->mocked_redis->method('del')
->will($this->returnCallback([$this, 'delMocked'])); ->will($this->returnCallback([$this, 'delMocked']));
$nop = /** @return void */ function () {
return; return;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment