Fix codesniffer issue

tvdijen · tvdijen · commit 31a2455b75d5 · 2023-03-16T21:53:06.000+01:00
diff --git a/src/SAML2/Binding.php b/src/SAML2/Binding.php
@@ -111,10 +111,8 @@ public static function getCurrentBinding(ServerRequestInterface $request): Bindi
                     if (
                         ($contentType === 'text/xml' || $contentType === 'application/xml')
                         // See paragraph 3.2.3 of Binding for SAML2 (OASIS)
-                        || (
-                            $request->hasHeader('SOAPAction')
-                            && $request->getHeader('SOAPAction')[0] === 'http://www.oasis-open.org/committees/security'
-                        )
+                        || ($request->hasHeader('SOAPAction')
+                            && $request->getHeader('SOAPAction')[0] === 'http://www.oasis-open.org/committees/security')
                     ) {
                         return new SOAP();
                     }
diff --git a/src/SAML2/Utils/XPath.php b/src/SAML2/Utils/XPath.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SimpleSAML\SAML2\Utils;
 
 use DOMNode;
diff --git a/src/SAML2/XML/md/AbstractMetadataDocument.php b/src/SAML2/XML/md/AbstractMetadataDocument.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SimpleSAML\SAML2\XML\md;
 
 use DOMElement;
diff --git a/src/SAML2/XML/mdui/DiscoHints.php b/src/SAML2/XML/mdui/DiscoHints.php
@@ -99,12 +99,10 @@ public function addChild(Chunk $child): void
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->elements)
+        return empty($this->elements)
             && empty($this->ipHint)
             && empty($this->domainHint)
-            && empty($this->geolocationHint)
-        );
+            && empty($this->geolocationHint);
     }
 
 
diff --git a/src/SAML2/XML/mdui/UIInfo.php b/src/SAML2/XML/mdui/UIInfo.php
@@ -202,15 +202,13 @@ public function addChild(Chunk $child): void
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->displayName)
+        return empty($this->displayName)
             && empty($this->description)
             && empty($this->informationURL)
             && empty($this->privacyStatementURL)
             && empty($this->keywords)
             && empty($this->logo)
-            && empty($this->elements)
-        );
+            && empty($this->elements);
     }
 
 
diff --git a/src/SAML2/XML/saml/AbstractBaseID.php b/src/SAML2/XML/saml/AbstractBaseID.php
@@ -95,7 +95,7 @@ public static function fromXML(DOMElement $xml): static
             list($element) = $qname;
         }
         $ns = $xml->lookupNamespaceUri($prefix);
-        $type = ($ns === null ) ? $element : implode(':', [$ns, $element]);
+        $type = ($ns === null) ? $element : implode(':', [$ns, $element]);
 
         // now check if we have a handler registered for it
         $handler = Utils::getContainer()->getExtensionHandler($type);
diff --git a/src/SAML2/XML/saml/Advice.php b/src/SAML2/XML/saml/Advice.php
@@ -55,13 +55,11 @@ public function __construct(
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->assertionIDRef)
+        return empty($this->assertionIDRef)
             && empty($this->assertionURIRef)
             && empty($this->assertion)
             && empty($this->encryptedAssertion)
-            && empty($this->getElements())
-        );
+            && empty($this->getElements());
     }
 
 
diff --git a/src/SAML2/XML/saml/Conditions.php b/src/SAML2/XML/saml/Conditions.php
@@ -117,14 +117,12 @@ public function getProxyRestriction(): ?ProxyRestriction
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->notBefore)
+        return empty($this->notBefore)
             && empty($this->notOnOrAfter)
             && empty($this->condition)
             && empty($this->audienceRestriction)
             && $this->oneTimeUse === false
-            && empty($this->proxyRestriction)
-        );
+            && empty($this->proxyRestriction);
     }
 
 
diff --git a/src/SAML2/XML/saml/Evidence.php b/src/SAML2/XML/saml/Evidence.php
@@ -42,12 +42,10 @@ public function __construct(
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->assertionIDRef)
+        return empty($this->assertionIDRef)
             && empty($this->assertionURIRef)
             && empty($this->assertion)
-            && empty($this->encryptedAssertion)
-        );
+            && empty($this->encryptedAssertion);
     }
 
 
diff --git a/src/SAML2/XML/saml/ProxyRestriction.php b/src/SAML2/XML/saml/ProxyRestriction.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace SimpleSAML\SAML2\XML\saml;
 
 use DOMElement;
diff --git a/src/SAML2/XML/saml/SubjectConfirmationData.php b/src/SAML2/XML/saml/SubjectConfirmationData.php
@@ -137,15 +137,13 @@ public function getInfo(): array
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->notBefore)
+        return empty($this->notBefore)
             && empty($this->notOnOrAfter)
             && empty($this->recipient)
             && empty($this->inResponseTo)
             && empty($this->address)
             && empty($this->info)
-            && empty($this->namespacedAttributes)
-        );
+            && empty($this->namespacedAttributes);
     }
 
 
diff --git a/src/SAML2/XML/saml/SubjectLocality.php b/src/SAML2/XML/saml/SubjectLocality.php
@@ -60,10 +60,8 @@ public function getDnsName(): ?string
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->address)
-            && empty($this->dnsName)
-        );
+        return empty($this->address)
+            && empty($this->dnsName);
     }
 
 
diff --git a/src/SAML2/XML/samlp/NameIDPolicy.php b/src/SAML2/XML/samlp/NameIDPolicy.php
@@ -68,11 +68,9 @@ public function getAllowCreate(): ?bool
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->Format)
+        return empty($this->Format)
             && empty($this->SPNameQualifier)
-            && empty($this->AllowCreate)
-        );
+            && empty($this->AllowCreate);
     }
 
 
diff --git a/src/SAML2/XML/samlp/Scoping.php b/src/SAML2/XML/samlp/Scoping.php
@@ -71,11 +71,9 @@ public function getProxyCount(): ?int
      */
     public function isEmptyElement(): bool
     {
-        return (
-            empty($this->proxyCount)
+        return empty($this->proxyCount)
             && empty($this->IDPList)
-            && empty($this->requesterId)
-        );
+            && empty($this->requesterId);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,10 @@ public function addChild(Chunk $child): void`
`99`	`99`	`*/`
`100`	`100`	`public function isEmptyElement(): bool`
`101`	`101`	`{`
`102`		`- return (`
`103`		`- empty($this->elements)`
	`102`	`+ return empty($this->elements)`
`104`	`103`	`&& empty($this->ipHint)`
`105`	`104`	`&& empty($this->domainHint)`
`106`		`- && empty($this->geolocationHint)`
`107`		`- );`
	`105`	`+ && empty($this->geolocationHint);`
`108`	`106`	`}`
`109`	`107`
`110`	`108`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public static function fromXML(DOMElement $xml): static`
`95`	`95`	`list($element) = $qname;`
`96`	`96`	`}`
`97`	`97`	`$ns = $xml->lookupNamespaceUri($prefix);`
`98`		`- $type = ($ns === null ) ? $element : implode(':', [$ns, $element]);`
	`98`	`+ $type = ($ns === null) ? $element : implode(':', [$ns, $element]);`
`99`	`99`
`100`	`100`	`// now check if we have a handler registered for it`
`101`	`101`	`$handler = Utils::getContainer()->getExtensionHandler($type);`
Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,11 @@ public function __construct(`
`55`	`55`	`*/`
`56`	`56`	`public function isEmptyElement(): bool`
`57`	`57`	`{`
`58`		`- return (`
`59`		`- empty($this->assertionIDRef)`
	`58`	`+ return empty($this->assertionIDRef)`
`60`	`59`	`&& empty($this->assertionURIRef)`
`61`	`60`	`&& empty($this->assertion)`
`62`	`61`	`&& empty($this->encryptedAssertion)`
`63`		`- && empty($this->getElements())`
`64`		`- );`
	`62`	`+ && empty($this->getElements());`
`65`	`63`	`}`
`66`	`64`
`67`	`65`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,10 @@ public function __construct(`
`42`	`42`	`*/`
`43`	`43`	`public function isEmptyElement(): bool`
`44`	`44`	`{`
`45`		`- return (`
`46`		`- empty($this->assertionIDRef)`
	`45`	`+ return empty($this->assertionIDRef)`
`47`	`46`	`&& empty($this->assertionURIRef)`
`48`	`47`	`&& empty($this->assertion)`
`49`		`- && empty($this->encryptedAssertion)`
`50`		`- );`
	`48`	`+ && empty($this->encryptedAssertion);`
`51`	`49`	`}`
`52`	`50`
`53`	`51`