Scrutinizer

src/SAML2/Assertion.php

@@ -559,7 +559,9 @@ private function parseAttributeValue($attribute, $attributeName)
                 } else {
                     /* Fall back for legacy IdPs sending string value (e.g. SSP < 1.15) */
                     Utils::getContainer()->getLogger()->warning(sprintf("Attribute %s (EPTI) value %d is not an XML NameId", $attributeName, $index));
-                    $this->attributes[$attributeName][] = XML\saml\NameID::fromArray(['Value' => $eptiAttributeValue->textContent]);
+                    $nameId = new XML\saml\NameID();
+                    $nameId->setValue($eptiAttributeValue->textContent);
+                    $this->attributes[$attributeName][] = $nameId;
                 }
             }
 
@@ -766,6 +768,7 @@ public function setNameId($nameId)
         assert(is_array($nameId) || is_null($nameId) || $nameId instanceof XML\saml\NameID);
 
         if (is_array($nameId)) {
+            // @deprecated behaviour
             $nameId = XML\saml\NameID::fromArray($nameId);
         }
         $this->nameId = $nameId;
@@ -1147,7 +1150,7 @@ public function getSignatureMethod()
     /**
      * Set the signature method used.
      *
-     * @param string|null $signatureMethod.
+     * @param string|null $signatureMethod
      */
     public function setSignatureMethod($signatureMethod)
     {
@@ -1189,7 +1192,7 @@ public function getAuthnContextDecl()
     /**
      * Set the authentication context declaration reference.
      *
-     * @param string $authnContextDeclRef
+     * @param string|\SAML2\XML\Chunk $authnContextDeclRef
      * @throws \Exception
      */
     public function setAuthnContextDeclRef($authnContextDeclRef)

src/SAML2/AuthnRequest.php

@@ -113,7 +113,7 @@ class AuthnRequest extends Request
      *
      * @var array
      */
-    private $audiences;
+    private $audiences = [];
 
     /**
      * @var \SAML2\XML\saml\SubjectConfirmation[]
@@ -441,7 +441,7 @@ public function setIsPassive($isPassive)
      *
      * This may be null, in which case no audience is included.
      *
-     * @return array|null The audiences.
+     * @return array The audiences.
      */
     public function getAudiences()
     {
@@ -455,7 +455,7 @@ public function getAudiences()
      *
      * @param array|null $audiences The audiences.
      */
-    public function setAudiences(array $audiences = null)
+    public function setAudiences(array $audiences)
     {
         $this->audiences = $audiences;
     }
@@ -626,11 +626,11 @@ public function getRequestedAuthnContext()
     /**
      * Set the RequestedAuthnContext.
      *
-     * @param array|null $requestedAuthnContext The RequestedAuthnContext.
+     * @param array $requestedAuthnContext The RequestedAuthnContext.
      */
     public function setRequestedAuthnContext($requestedAuthnContext)
     {
-        assert(is_array($requestedAuthnContext) || is_null($requestedAuthnContext));
+        assert(is_array($requestedAuthnContext));
 
         $this->requestedAuthnContext = $requestedAuthnContext;
     }
@@ -872,7 +872,7 @@ private function addSubject(\DOMElement $root)
      */
     private function addConditions(\DOMElement $root)
     {
-        if ($this->audiences !== null) {
+        if ($this->audiences !== []) {
             $document = $root->ownerDocument;
 
             $conditions = $document->createElementNS(Constants::NS_SAML, 'saml:Conditions');
@@ -881,7 +881,7 @@ private function addConditions(\DOMElement $root)
             $ar = $document->createElementNS(Constants::NS_SAML, 'saml:AudienceRestriction');
             $conditions->appendChild($ar);
 
-            Utils::addStrings($ar, Constants::NS_SAML, 'saml:Audience', false, $this->audiences);
+            Utils::addStrings($ar, Constants::NS_SAML, 'saml:Audience', false, $this->getAudiences());
         }
     }
 }

src/SAML2/Compat/AbstractContainer.php

@@ -24,7 +24,7 @@ abstract public function generateId();
      * - **encrypt** XML that is about to be encrypted
      * - **decrypt** XML that was just decrypted
      *
-     * @param string $message
+     * @param string|\DOMNode $message
      * @param string $type
      * @return void
      */

src/SAML2/Compat/ContainerSingleton.php

@@ -7,12 +7,12 @@
 class ContainerSingleton
 {
     /**
-     * @var \SAML2\Compat\Ssp\Container
+     * @var \SAML2\Compat\AbstractContainer
      */
     protected static $container;
 
     /**
-     * @return \SAML2\Compat\Ssp\Container
+     * @return \SAML2\Compat\AbstractContainer
      */
     public static function getInstance()
     {

src/SAML2/Message.php

@@ -23,7 +23,7 @@ abstract class Message implements SignedElement
      *
      * @var array
      */
-    protected $extensions;
+    protected $extensions = [];
 
     /**
      * The name of the root element of the DOM tree for the message.
@@ -589,7 +589,7 @@ public static function fromXML(\DOMElement $xml)
     /**
      * Retrieve the Extensions.
      *
-     * @return \SAML2\XML\samlp\Extensions
+     * @return \SAML2\XML\samlp\Extensions[]
      */
     public function getExtensions()
     {
@@ -599,12 +599,10 @@ public function getExtensions()
     /**
      * Set the Extensions.
      *
-     * @param array|null $extensions The Extensions
+     * @param array $extensions The Extensions
      */
-    public function setExtensions($extensions)
+    public function setExtensions(array $extensions)
     {
-        assert(is_array($extensions) || is_null($extensions));
-
         $this->extensions = $extensions;
     }
 

src/SAML2/SOAPClient.php

@@ -224,7 +224,7 @@ public static function validateSSL($data, XMLSecurityKey $key)
     /*
      * Extracts the SOAP Fault from SOAP message
      * @param $soapmessage Soap response needs to be type DOMDocument
-     * @return $soapfaultstring string|null
+     * @return string|null $soapfaultstring
      */
     private function getSOAPFault($soapMessage)
     {

src/SAML2/XML/ecp/Response.php

@@ -62,7 +62,7 @@ public function getAssertionConsumerServiceURL()
 
     /**
      * Set the value of the AssertionConsumerServiceURL-property
-     * @param string $AssertionConsumerServiceURL
+     * @param string $assertionConsumerServiceURL
      */
     public function setAssertionConsumerServiceURL($assertionConsumerServiceURL)
     {

src/SAML2/XML/md/EntitiesDescriptor.php

@@ -101,7 +101,7 @@ public function __construct(\DOMElement $xml = null)
      */
     public function getName()
     {
-        return $this->name;
+        return $this->Name;
     }
 
     /**

src/SAML2/XML/md/EntityDescriptor.php

@@ -294,9 +294,9 @@ public function setRoleDescriptor(array $roleDescriptor)
 
     /**
      * Add the value to the RoleDescriptor-property
-     * @param \SAML2\XML\md\Role $roleDescriptor
+     * @param \SAML2\XML\md\RoleDescriptor $roleDescriptor
      */
-    public function addRoleDescriptor($roleDescriptor)
+    public function addRoleDescriptor(RoleDescriptor $roleDescriptor)
     {
         $this->RoleDescriptor[] = $roleDescriptor;
     }
@@ -312,7 +312,7 @@ public function getAffiliationDescriptor()
 
     /**
      * Set the value of the AffliationDescriptor-property
-     * @param \SAML2\XML\md\AffiliationDescriptor $affiliationDescriptor|null
+     * @param \SAML2\XML\md\AffiliationDescriptor|null $affiliationDescriptor
      */
     public function setAffiliationDescriptor(AffiliationDescriptor $affiliationDescriptor = null)
     {
@@ -330,7 +330,7 @@ public function getOrganization()
 
     /**
      * Set the value of the Organization-property
-     * @param \SAML2\XML\md\Organization $organization|null
+     * @param \SAML2\XML\md\Organization|null $organization
      */
     public function setOrganization(Organization $organization = null)
     {

src/SAML2/XML/md/PDPDescriptor.php

@@ -78,7 +78,7 @@ public function getAuthzService()
 
     /**
      * Set the value of the AuthzService-property
-     * @param \SAML2\XML\md\EndpointType[] $AuthzService
+     * @param \SAML2\XML\md\EndpointType[] $authzService
      */
     public function setAuthzService(array $authzService = [])
     {

src/SAML2/XML/md/RoleDescriptor.php

@@ -140,7 +140,7 @@ protected function __construct($elementName, \DOMElement $xml = null)
         }
 
         foreach (Utils::xpQuery($xml, './saml_metadata:ContactPerson') as $cp) {
-            $this->addContactPersons(ContactPerson($cp));
+            $this->addContactPerson(ContactPerson($cp));
         }
     }
 
@@ -270,7 +270,7 @@ public function getOrganization()
 
     /**
      * Set the value of the Organization-property
-     * @param \SAML2\XML\md\Organization $organization|null
+     * @param \SAML2\XML\md\Organization|null $organization
      */
     public function setOrganization(Organization $organization = null)
     {

src/SAML2/XML/md/SSODescriptorType.php

@@ -99,7 +99,7 @@ public function setArtifactResolutionService(array $artifactResolutionService)
 
     /**
      * Add the value to the ArtifactResolutionService-property
-     * @param \SAML2\XML\md\IndexedEndpointType $artifactResolucationService
+     * @param \SAML2\XML\md\IndexedEndpointType $artifactResolutionService
      */
     public function addArtifactResolutionService(IndexedEndpointType $artifactResolutionService)
     {

src/SAML2/XML/mdattr/EntityAttributes.php

@@ -68,7 +68,7 @@ public function setChildren(array $children)
 
     /**
      * Add the value to the children-property
-     * @param \SAML2\XML\Chunk $child
+     * @param \SAML2\XML\Chunk|\SAML2\XML\saml\Attribute $child
      */
     public function addChildren($child)
     {

src/SAML2/XML/saml/Attribute.php

@@ -102,7 +102,7 @@ public function getNameFormat()
 
     /**
      * Set the value of the NameFormat-property
-     * @param string|null $NameFormat
+     * @param string|null $nameFormat
      */
     public function setNameFormat($nameFormat = null)
     {

src/SAML2/XML/shibmd/Scope.php

@@ -93,7 +93,7 @@ public function setIsRegexpScope($regexp)
     public function toXML(\DOMElement $parent)
     {
         assert(is_string($this->getScope()));
-        assert(is_bool($this->isRegexpScope()) || is_null($this->isRRegexpScope()));
+        assert(is_bool($this->isRegexpScope()) || is_null($this->isRegexpScope()));
 
         $doc = $parent->ownerDocument;
 

tests/SAML2/LogoutRequestTest.php

@@ -191,9 +191,11 @@ public function testGetNotOnOrAfter()
     public function testSetNotOnOrAfter()
     {
         $time = time();
+        $nameId = new XML\saml\NameID();
+        $nameId->setValue('NameIDValue');
 
         $logoutRequest = new LogoutRequest();
-        $logoutRequest->setNameID(['Value' => 'NameIDValue']);
+        $logoutRequest->setNameID($nameId);
         $logoutRequest->setNotOnOrAfter($time);
         $logoutRequestElement = $logoutRequest->toUnsignedXML();