From 4522cc9a57a6b18d2e070f47ed69f3d77b603f3a Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Tue, 24 Aug 2021 20:48:49 +0000
Subject: [PATCH] Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
attributemap/deprecatedSchacNS.php | 42 +++++++++----------
attributemap/newSchacNS.php | 42 +++++++++----------
lib/SimpleSAML/Auth/Simple.php | 12 +++---
lib/SimpleSAML/Locale/Localization.php | 2 +-
lib/SimpleSAML/Utils/System.php | 2 +-
lib/SimpleSAML/XHTML/Template.php | 2 +-
modules/core/lib/Auth/Process/Cardinality.php | 2 +-
.../lib/Auth/Process/CardinalitySingle.php | 2 +-
modules/saml/lib/IdP/SAML2.php | 6 +--
9 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/attributemap/deprecatedSchacNS.php b/attributemap/deprecatedSchacNS.php
index d8ce0e79d..93cc05f7a 100644
--- a/attributemap/deprecatedSchacNS.php
+++ b/attributemap/deprecatedSchacNS.php
@@ -12,25 +12,25 @@ if (!defined('SCHAC_NEW_NS')) {
}
$attributemap = [
- SCHAC_NEW_NS.'schacCountryOfCitizenship' => SCHAC_OLD_NS.'schacCountryOfCitizenship',
- SCHAC_NEW_NS.'schacCountryOfResidence' => SCHAC_OLD_NS.'schacCountryOfResidence',
- SCHAC_NEW_NS.'schacDateOfBirth' => SCHAC_OLD_NS.'schacDateOfBirth',
- SCHAC_NEW_NS.'schacExpiryDate' => SCHAC_OLD_NS.'schacExpiryDate',
- SCHAC_NEW_NS.'schacGender' => SCHAC_OLD_NS.'schacGender',
- SCHAC_NEW_NS.'schacHomeOrganization' => SCHAC_OLD_NS.'schacHomeOrganization',
- SCHAC_NEW_NS.'schacHomeOrganizationType' => SCHAC_OLD_NS.'schacHomeOrganizationType',
- SCHAC_NEW_NS.'schacMotherTongue' => SCHAC_OLD_NS.'schacMotherTongue',
- SCHAC_NEW_NS.'schacPersonalPosition' => SCHAC_OLD_NS.'schacPersonalPosition',
- SCHAC_NEW_NS.'schacPersonalTitle' => SCHAC_OLD_NS.'schacPersonalTitle',
- SCHAC_NEW_NS.'schacPersonalUniqueCode' => SCHAC_OLD_NS.'schacPersonalUniqueCode',
- SCHAC_NEW_NS.'schacPersonalUniqueID' => SCHAC_OLD_NS.'schacPersonalUniqueID',
- SCHAC_NEW_NS.'schacPlaceOfBirth' => SCHAC_OLD_NS.'schacPlaceOfBirth',
- SCHAC_NEW_NS.'schacProjectMembership' => SCHAC_OLD_NS.'schacProjectMembership',
- SCHAC_NEW_NS.'schacProjectSpecificRole' => SCHAC_OLD_NS.'schacProjectSpecificRole',
- SCHAC_NEW_NS.'schacSn1' => SCHAC_OLD_NS.'schacSn1',
- SCHAC_NEW_NS.'schacSn2' => SCHAC_OLD_NS.'schacSn2',
- SCHAC_NEW_NS.'schacUserPresenceID' => SCHAC_OLD_NS.'schacUserPresenceID',
- SCHAC_NEW_NS.'schacUserPrivateAttribute' => SCHAC_OLD_NS.'schacUserPrivateAttribute',
- SCHAC_NEW_NS.'schacUserStatus' => SCHAC_OLD_NS.'schacUserStatus',
- SCHAC_NEW_NS.'schacYearOfBirth' => SCHAC_OLD_NS.'schacYearOfBirth',
+ SCHAC_NEW_NS . 'schacCountryOfCitizenship' => SCHAC_OLD_NS . 'schacCountryOfCitizenship',
+ SCHAC_NEW_NS . 'schacCountryOfResidence' => SCHAC_OLD_NS . 'schacCountryOfResidence',
+ SCHAC_NEW_NS . 'schacDateOfBirth' => SCHAC_OLD_NS . 'schacDateOfBirth',
+ SCHAC_NEW_NS . 'schacExpiryDate' => SCHAC_OLD_NS . 'schacExpiryDate',
+ SCHAC_NEW_NS . 'schacGender' => SCHAC_OLD_NS . 'schacGender',
+ SCHAC_NEW_NS . 'schacHomeOrganization' => SCHAC_OLD_NS . 'schacHomeOrganization',
+ SCHAC_NEW_NS . 'schacHomeOrganizationType' => SCHAC_OLD_NS . 'schacHomeOrganizationType',
+ SCHAC_NEW_NS . 'schacMotherTongue' => SCHAC_OLD_NS . 'schacMotherTongue',
+ SCHAC_NEW_NS . 'schacPersonalPosition' => SCHAC_OLD_NS . 'schacPersonalPosition',
+ SCHAC_NEW_NS . 'schacPersonalTitle' => SCHAC_OLD_NS . 'schacPersonalTitle',
+ SCHAC_NEW_NS . 'schacPersonalUniqueCode' => SCHAC_OLD_NS . 'schacPersonalUniqueCode',
+ SCHAC_NEW_NS . 'schacPersonalUniqueID' => SCHAC_OLD_NS . 'schacPersonalUniqueID',
+ SCHAC_NEW_NS . 'schacPlaceOfBirth' => SCHAC_OLD_NS . 'schacPlaceOfBirth',
+ SCHAC_NEW_NS . 'schacProjectMembership' => SCHAC_OLD_NS . 'schacProjectMembership',
+ SCHAC_NEW_NS . 'schacProjectSpecificRole' => SCHAC_OLD_NS . 'schacProjectSpecificRole',
+ SCHAC_NEW_NS . 'schacSn1' => SCHAC_OLD_NS . 'schacSn1',
+ SCHAC_NEW_NS . 'schacSn2' => SCHAC_OLD_NS . 'schacSn2',
+ SCHAC_NEW_NS . 'schacUserPresenceID' => SCHAC_OLD_NS . 'schacUserPresenceID',
+ SCHAC_NEW_NS . 'schacUserPrivateAttribute' => SCHAC_OLD_NS . 'schacUserPrivateAttribute',
+ SCHAC_NEW_NS . 'schacUserStatus' => SCHAC_OLD_NS . 'schacUserStatus',
+ SCHAC_NEW_NS . 'schacYearOfBirth' => SCHAC_OLD_NS . 'schacYearOfBirth',
];
diff --git a/attributemap/newSchacNS.php b/attributemap/newSchacNS.php
index 8de37c992..55d2a1414 100644
--- a/attributemap/newSchacNS.php
+++ b/attributemap/newSchacNS.php
@@ -12,25 +12,25 @@ if (!defined('SCHAC_NEW_NS')) {
}
$attributemap = [
- SCHAC_OLD_NS.'schacCountryOfCitizenship' => SCHAC_NEW_NS.'schacCountryOfCitizenship',
- SCHAC_OLD_NS.'schacCountryOfResidence' => SCHAC_NEW_NS.'schacCountryOfResidence',
- SCHAC_OLD_NS.'schacDateOfBirth' => SCHAC_NEW_NS.'schacDateOfBirth',
- SCHAC_OLD_NS.'schacExpiryDate' => SCHAC_NEW_NS.'schacExpiryDate',
- SCHAC_OLD_NS.'schacGender' => SCHAC_NEW_NS.'schacGender',
- SCHAC_OLD_NS.'schacHomeOrganization' => SCHAC_NEW_NS.'schacHomeOrganization',
- SCHAC_OLD_NS.'schacHomeOrganizationType' => SCHAC_NEW_NS.'schacHomeOrganizationType',
- SCHAC_OLD_NS.'schacMotherTongue' => SCHAC_NEW_NS.'schacMotherTongue',
- SCHAC_OLD_NS.'schacPersonalPosition' => SCHAC_NEW_NS.'schacPersonalPosition',
- SCHAC_OLD_NS.'schacPersonalTitle' => SCHAC_NEW_NS.'schacPersonalTitle',
- SCHAC_OLD_NS.'schacPersonalUniqueCode' => SCHAC_NEW_NS.'schacPersonalUniqueCode',
- SCHAC_OLD_NS.'schacPersonalUniqueID' => SCHAC_NEW_NS.'schacPersonalUniqueID',
- SCHAC_OLD_NS.'schacPlaceOfBirth' => SCHAC_NEW_NS.'schacPlaceOfBirth',
- SCHAC_OLD_NS.'schacProjectMembership' => SCHAC_NEW_NS.'schacProjectMembership',
- SCHAC_OLD_NS.'schacProjectSpecificRole' => SCHAC_NEW_NS.'schacProjectSpecificRole',
- SCHAC_OLD_NS.'schacSn1' => SCHAC_NEW_NS.'schacSn1',
- SCHAC_OLD_NS.'schacSn2' => SCHAC_NEW_NS.'schacSn2',
- SCHAC_OLD_NS.'schacUserPresenceID' => SCHAC_NEW_NS.'schacUserPresenceID',
- SCHAC_OLD_NS.'schacUserPrivateAttribute' => SCHAC_NEW_NS.'schacUserPrivateAttribute',
- SCHAC_OLD_NS.'schacUserStatus' => SCHAC_NEW_NS.'schacUserStatus',
- SCHAC_OLD_NS.'schacYearOfBirth' => SCHAC_NEW_NS.'schacYearOfBirth',
+ SCHAC_OLD_NS . 'schacCountryOfCitizenship' => SCHAC_NEW_NS . 'schacCountryOfCitizenship',
+ SCHAC_OLD_NS . 'schacCountryOfResidence' => SCHAC_NEW_NS . 'schacCountryOfResidence',
+ SCHAC_OLD_NS . 'schacDateOfBirth' => SCHAC_NEW_NS . 'schacDateOfBirth',
+ SCHAC_OLD_NS . 'schacExpiryDate' => SCHAC_NEW_NS . 'schacExpiryDate',
+ SCHAC_OLD_NS . 'schacGender' => SCHAC_NEW_NS . 'schacGender',
+ SCHAC_OLD_NS . 'schacHomeOrganization' => SCHAC_NEW_NS . 'schacHomeOrganization',
+ SCHAC_OLD_NS . 'schacHomeOrganizationType' => SCHAC_NEW_NS . 'schacHomeOrganizationType',
+ SCHAC_OLD_NS . 'schacMotherTongue' => SCHAC_NEW_NS . 'schacMotherTongue',
+ SCHAC_OLD_NS . 'schacPersonalPosition' => SCHAC_NEW_NS . 'schacPersonalPosition',
+ SCHAC_OLD_NS . 'schacPersonalTitle' => SCHAC_NEW_NS . 'schacPersonalTitle',
+ SCHAC_OLD_NS . 'schacPersonalUniqueCode' => SCHAC_NEW_NS . 'schacPersonalUniqueCode',
+ SCHAC_OLD_NS . 'schacPersonalUniqueID' => SCHAC_NEW_NS . 'schacPersonalUniqueID',
+ SCHAC_OLD_NS . 'schacPlaceOfBirth' => SCHAC_NEW_NS . 'schacPlaceOfBirth',
+ SCHAC_OLD_NS . 'schacProjectMembership' => SCHAC_NEW_NS . 'schacProjectMembership',
+ SCHAC_OLD_NS . 'schacProjectSpecificRole' => SCHAC_NEW_NS . 'schacProjectSpecificRole',
+ SCHAC_OLD_NS . 'schacSn1' => SCHAC_NEW_NS . 'schacSn1',
+ SCHAC_OLD_NS . 'schacSn2' => SCHAC_NEW_NS . 'schacSn2',
+ SCHAC_OLD_NS . 'schacUserPresenceID' => SCHAC_NEW_NS . 'schacUserPresenceID',
+ SCHAC_OLD_NS . 'schacUserPrivateAttribute' => SCHAC_NEW_NS . 'schacUserPrivateAttribute',
+ SCHAC_OLD_NS . 'schacUserStatus' => SCHAC_NEW_NS . 'schacUserStatus',
+ SCHAC_OLD_NS . 'schacYearOfBirth' => SCHAC_NEW_NS . 'schacYearOfBirth',
];
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
index a82792de6..c037ef991 100644
--- a/lib/SimpleSAML/Auth/Simple.php
+++ b/lib/SimpleSAML/Auth/Simple.php
@@ -371,14 +371,14 @@ class Simple
}
$scheme = parse_url($url, PHP_URL_SCHEME);
- $host = parse_url($url, PHP_URL_HOST) ? : $httpUtils->getSelfHost();
- $port = parse_url($url, PHP_URL_PORT) ? : (
+ $host = parse_url($url, PHP_URL_HOST) ?: $httpUtils->getSelfHost();
+ $port = parse_url($url, PHP_URL_PORT) ?: (
$scheme ? '' : ltrim($httpUtils->getServerPort(), ':')
);
- $scheme = $scheme ? : ($httpUtils->getServerHTTPS() ? 'https' : 'http');
- $path = parse_url($url, PHP_URL_PATH) ? : '/';
- $query = parse_url($url, PHP_URL_QUERY) ? : '';
- $fragment = parse_url($url, PHP_URL_FRAGMENT) ? : '';
+ $scheme = $scheme ?: ($httpUtils->getServerHTTPS() ? 'https' : 'http');
+ $path = parse_url($url, PHP_URL_PATH) ?: '/';
+ $query = parse_url($url, PHP_URL_QUERY) ?: '';
+ $fragment = parse_url($url, PHP_URL_FRAGMENT) ?: '';
$port = !empty($port) ? ':' . $port : '';
if (($scheme === 'http' && $port === ':80') || ($scheme === 'https' && $port === ':443')) {
diff --git a/lib/SimpleSAML/Locale/Localization.php b/lib/SimpleSAML/Locale/Localization.php
index 6aaae8aa8..21c606062 100644
--- a/lib/SimpleSAML/Locale/Localization.php
+++ b/lib/SimpleSAML/Locale/Localization.php
@@ -98,7 +98,7 @@ class Localization
{
$this->configuration = $configuration;
/** @var string $locales */
- $locales = $this->configuration->resolvePath('locales');
+ $locales = $this->configuration->resolvePath('locales');
$this->localeDir = $locales;
$this->language = new Language($configuration);
$this->langcode = $this->language->getPosixLanguage($this->language->getLanguage());
diff --git a/lib/SimpleSAML/Utils/System.php b/lib/SimpleSAML/Utils/System.php
index 4b6913231..33efcae4e 100644
--- a/lib/SimpleSAML/Utils/System.php
+++ b/lib/SimpleSAML/Utils/System.php
@@ -98,7 +98,7 @@ class System
throw new Error\Exception(
'Temporary directory "' . $tempDir .
'" cannot be written to by the current user' .
- (function_exists('posix_getuid') ? ' "' . posix_getuid() . '"' : '')
+ (function_exists('posix_getuid') ? ' "' . posix_getuid() . '"' : '')
);
}
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index 6d3e5fde5..e75907e63 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -166,7 +166,7 @@ class Template extends Response
$baseDir = $this->configuration->getBaseDir();
if (is_null($module)) {
$file = $baseDir . 'www/assets/' . $asset;
- $basePath = $this->configuration->getBasePath();
+ $basePath = $this->configuration->getBasePath();
$path = $basePath . 'assets/' . $asset;
} else {
$file = $baseDir . 'modules/' . $module . '/www/assets/' . $asset;
diff --git a/modules/core/lib/Auth/Process/Cardinality.php b/modules/core/lib/Auth/Process/Cardinality.php
index 1c90f269c..0a15500e0 100644
--- a/modules/core/lib/Auth/Process/Cardinality.php
+++ b/modules/core/lib/Auth/Process/Cardinality.php
@@ -40,7 +40,7 @@ class Cardinality extends Auth\ProcessingFilter
{
parent::__construct($config, $reserved);
- $this->httpUtils = $httpUtils ? : new Utils\HTTP();
+ $this->httpUtils = $httpUtils ?: new Utils\HTTP();
foreach ($config as $attribute => $rules) {
if ($attribute === '%ignoreEntities') {
diff --git a/modules/core/lib/Auth/Process/CardinalitySingle.php b/modules/core/lib/Auth/Process/CardinalitySingle.php
index 98b5f4b0d..64c5e0595 100644
--- a/modules/core/lib/Auth/Process/CardinalitySingle.php
+++ b/modules/core/lib/Auth/Process/CardinalitySingle.php
@@ -50,7 +50,7 @@ class CardinalitySingle extends Auth\ProcessingFilter
{
parent::__construct($config, $reserved);
- $this->httpUtils = $httpUtils ? : new Utils\HTTP();
+ $this->httpUtils = $httpUtils ?: new Utils\HTTP();
if (array_key_exists('singleValued', $config)) {
$this->singleValued = $config['singleValued'];
diff --git a/modules/saml/lib/IdP/SAML2.php b/modules/saml/lib/IdP/SAML2.php
index 7155f0d4c..84ec8e2ed 100644
--- a/modules/saml/lib/IdP/SAML2.php
+++ b/modules/saml/lib/IdP/SAML2.php
@@ -330,9 +330,9 @@ class SAML2
}
if (isset($_REQUEST['ConsumerURL'])) {
- $consumerURL = (string)$_REQUEST['ConsumerURL'];
+ $consumerURL = (string) $_REQUEST['ConsumerURL'];
} elseif (isset($_REQUEST['shire'])) {
- $consumerURL = (string)$_REQUEST['shire'];
+ $consumerURL = (string) $_REQUEST['shire'];
} else {
$consumerURL = null;
}
@@ -357,7 +357,7 @@ class SAML2
try {
$binding = Binding::getCurrentBinding();
} catch (Exception $e) {
- header($_SERVER["SERVER_PROTOCOL"]." 405 Method Not Allowed", true, 405);
+ header($_SERVER["SERVER_PROTOCOL"] . " 405 Method Not Allowed", true, 405);
exit;
}
$request = $binding->receive();
--
GitLab