Merge remote-tracking branch 'origin/release-1.x'

README.md

@@ -19,7 +19,7 @@ information via EngineBlock's internal API.
 
 ## Requirements
 - PHP 5.6
-- EngineBlock >= 5.2.0
+- EngineBlock >= 5.5.0
 
 ## Development
 To setup your development environment, run `vagrant up` in the project directory.

composer.json

@@ -15,7 +15,7 @@
         "sensio/framework-extra-bundle": "^3.0.2",
         "doctrine/instantiator": "1.0.*",
         "incenteev/composer-parameter-handler": "~2.0",
-        "surfnet/stepup-saml-bundle": "^2.6.1",
+        "surfnet/stepup-saml-bundle": "^3.0",
         "jms/translation-bundle": "^1.1",
         "jms/di-extra-bundle": "^1.1",
         "twig/twig": "^1.34.4",

src/OpenConext/Profile/Entity/AuthenticatedUser.php

@@ -73,7 +73,7 @@ public static function createFrom(AssertionAdapter $assertionAdapter, array $aut
             }
 
             $eptiValues = $attribute->getValue();
-            $attributes[] = new Attribute($definition, [$eptiValues[0]['Value']]);
+            $attributes[] = new Attribute($definition, [$eptiValues[0]->value]);
         }
 
         return new self($assertionAdapter->getNameId(), AttributeSet::create($attributes), $authenticatingAuthorities);

src/OpenConext/Profile/Tests/Entity/AuthenticatedUserTest.php

@@ -22,10 +22,10 @@
 use OpenConext\Profile\Entity\AuthenticatedUser;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
-use SAML2_Assertion;
-use SAML2_Compat_ContainerSingleton;
-use SAML2_DOMDocumentFactory;
-use SAML2_Exception_RuntimeException;
+use SAML2\Assertion;
+use SAML2\Compat\ContainerSingleton;
+use SAML2\DOMDocumentFactory;
+use SAML2\Exception\RuntimeException;
 use Surfnet\SamlBundle\SAML2\Attribute\Attribute;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDefinition;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDictionary;
@@ -40,7 +40,7 @@ class AuthenticatedUserTest extends TestCase
      */
     public function setUp()
     {
-        SAML2_Compat_ContainerSingleton::setContainer(new BridgeContainer(new NullLogger()));
+        ContainerSingleton::setContainer(new BridgeContainer(new NullLogger()));
     }
 
     /**
@@ -140,7 +140,7 @@ public function attributes_are_filtered_when_creating_an_authenticated_user()
      */
     public function epti_attribute_cannot_be_set_if_its_value_has_multiple_name_ids_when_creating_an_authenticated_user()
     {
-        $this->expectException(SAML2_Exception_RuntimeException::class, 'must be a NameID');
+        $this->expectException(RuntimeException::class, 'must be a NameID');
 
         $assertionWithEpti   = $this->getAssertionWithEptiWithTooManyValues();
         $attributeDictionary = $this->getAttributeDictionary();
@@ -161,7 +161,7 @@ public function epti_attribute_cannot_be_set_if_its_value_has_multiple_name_ids_
      */
     public function epti_attribute_cannot_be_set_if_its_value_has_no_name_id_when_creating_an_authenticated_user()
     {
-        $this->expectException(SAML2_Exception_RuntimeException::class, 'must be a NameID');
+        $this->expectException(RuntimeException::class, 'must be a NameID');
 
         $assertionWithEpti   = $this->getAssertionWithEptiWithoutValues();
         $attributeDictionary = $this->getAttributeDictionary();
@@ -257,7 +257,7 @@ private function getAssertionWithEpti()
    </saml:Assertion>
 XML;
 
-        return new SAML2_Assertion(SAML2_DOMDocumentFactory::fromString($xml)->firstChild);
+        return new Assertion(DOMDocumentFactory::fromString($xml)->firstChild);
     }
 
     private function getAssertionWithEptiWithoutValues()
@@ -284,7 +284,7 @@ private function getAssertionWithEptiWithoutValues()
    </saml:Assertion>
 XML;
 
-        return new SAML2_Assertion(SAML2_DOMDocumentFactory::fromString($xml)->firstChild);
+        return new Assertion(DOMDocumentFactory::fromString($xml)->firstChild);
     }
 
     private function getAssertionWithEptiWithTooManyValues()
@@ -314,6 +314,6 @@ private function getAssertionWithEptiWithTooManyValues()
    </saml:Assertion>
 XML;
 
-        return new SAML2_Assertion(SAML2_DOMDocumentFactory::fromString($xml)->firstChild);
+        return new Assertion(DOMDocumentFactory::fromString($xml)->firstChild);
     }
 }

src/OpenConext/ProfileBundle/Attribute/AttributeSetWithFallbacks.php

@@ -18,7 +18,7 @@
 
 namespace OpenConext\ProfileBundle\Attribute;
 
-use SAML2_Assertion;
+use SAML2\Assertion;
 use Surfnet\SamlBundle\Exception\UnknownUrnException;
 use Surfnet\SamlBundle\SAML2\Attribute\Attribute;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDefinition;
@@ -29,7 +29,7 @@
 
 final class AttributeSetWithFallbacks extends AttributeSet implements AttributeSetFactory, AttributeSetInterface
 {
-    public static function createFrom(SAML2_Assertion $assertion, AttributeDictionary $attributeDictionary)
+    public static function createFrom(Assertion $assertion, AttributeDictionary $attributeDictionary)
     {
         $attributeSet = new AttributeSetWithFallbacks();
 

src/OpenConext/ProfileBundle/Security/Authentication/SamlInteractionProvider.php

@@ -92,11 +92,11 @@ public function initiateSamlRequest()
 
     /**
      * @param Request $request
-     * @return \SAML2_Assertion
+     * @return \SAML2\Assertion
      */
     public function processSamlResponse(Request $request)
     {
-        /** @var \SAML2_Assertion $assertion */
+        /** @var \SAML2\Assertion $assertion */
         $assertion = $this->postBinding->processResponse(
             $request,
             $this->identityProvider,

src/OpenConext/ProfileBundle/Security/Authentication/Token/SamlToken.php

@@ -23,7 +23,7 @@
 class SamlToken extends AbstractToken
 {
     /**
-     * @var \SAML2_Assertion
+     * @var \SAML2\Assertion
      */
     public $assertion;
 

src/OpenConext/ProfileBundle/Security/Firewall/SamlListener.php

@@ -22,7 +22,7 @@
 use OpenConext\ProfileBundle\Saml\StateHandler;
 use OpenConext\ProfileBundle\Security\Authentication\SamlInteractionProvider;
 use OpenConext\ProfileBundle\Security\Authentication\Token\SamlToken;
-use SAML2_Response_Exception_PreconditionNotMetException as PreconditionNotMetException;
+use SAML2\Response\Exception\PreconditionNotMetException;
 use Surfnet\SamlBundle\Http\Exception\AuthnFailedSamlResponseException;
 use Surfnet\SamlBundle\SAML2\Response\Assertion\InResponseTo;
 use Symfony\Component\HttpFoundation\RedirectResponse;

src/OpenConext/ProfileBundle/Tests/Attribute/AttributeSetWithFallbacksTest.php

@@ -21,7 +21,7 @@
 use Mockery;
 use OpenConext\ProfileBundle\Attribute\AttributeSetWithFallbacks;
 use PHPUnit\Framework\TestCase;
-use SAML2_Assertion;
+use SAML2\Assertion;
 use Surfnet\SamlBundle\SAML2\Attribute\Attribute;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDefinition;
 use Surfnet\SamlBundle\SAML2\Attribute\AttributeDictionary;
@@ -39,7 +39,7 @@ class AttributeSetWithFallbacksTest extends TestCase
      */
     public function attribute_set_with_fallbacks_can_be_configured_when_creating_an_assertion_adapter()
     {
-        $assertion = Mockery::mock(SAML2_Assertion::class);
+        $assertion = Mockery::mock(Assertion::class);
         $assertion
             ->shouldReceive('getAttributes')
             ->andReturn([]);
@@ -68,7 +68,7 @@ public function attribute_set_with_fallbacks_contains_an_attribute_with_an_exist
 
         $attributeDefinition = new AttributeDefinition('some-attribute', $attributeMaceUrn);
 
-        $assertion = Mockery::mock(SAML2_Assertion::class);
+        $assertion = Mockery::mock(Assertion::class);
         $assertion
             ->shouldReceive('getAttributes')
             ->andReturn([
@@ -97,7 +97,7 @@ public function attribute_set_with_fallbacks_falls_back_to_the_the_received_urn_
         $undefinedAttributeUrn = 'urn:mace:not-defined';
         $attributeValue        = ['some-value'];
 
-        $assertion = Mockery::mock(SAML2_Assertion::class);
+        $assertion = Mockery::mock(Assertion::class);
         $assertion
             ->shouldReceive('getAttributes')
             ->andReturn([