Bump test-framework

Author: tvdijen

composer.json

@@ -35,7 +35,7 @@
         }
     },
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-dom": "*",
 
         "beste/clock": "^3.0",
@@ -52,7 +52,7 @@
         "symfony/http-foundation": "^6.4"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp-test-framework": "~1.9.2"
+        "simplesamlphp/simplesamlphp-test-framework": "~1.10.3"
     },
     "support": {
         "issues": "https://github.com/simplesamlphp/simplesamlphp-module-adfs/issues",

src/Controller/Adfs.php

@@ -5,15 +5,22 @@
 namespace SimpleSAML\Module\adfs\Controller;
 
 use Exception;
-use SimpleSAML\{Configuration, IdP, Logger, Metadata, Module, Session, Utils};
+use SimpleSAML\Configuration;
 use SimpleSAML\Error as SspError;
+use SimpleSAML\IdP;
+use SimpleSAML\Logger;
+use SimpleSAML\Metadata;
 use SimpleSAML\Module\adfs\IdP\ADFS as ADFS_IDP;
 use SimpleSAML\Module\adfs\IdP\MetadataBuilder;
 use SimpleSAML\Module\adfs\IdP\PassiveIdP;
 use SimpleSAML\Module\adfs\MetadataExchange;
+use SimpleSAML\Session;
 use SimpleSAML\SOAP\XML\env_200305\Envelope;
+use SimpleSAML\Utils;
 use SimpleSAML\XML\DOMDocumentFactory;
-use Symfony\Component\HttpFoundation\{Request, Response, StreamedResponse};
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 /**
  * Controller class for the adfs module.
@@ -36,6 +43,7 @@ class Adfs
     /** @var \SimpleSAML\Utils\Crypto */
     protected Utils\Crypto $cryptoUtils;
 
+
     /**
      * AdfsController constructor.
      *

src/IdP/ADFS.php

@@ -15,7 +15,6 @@
 use SimpleSAML\Logger;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
 use SimpleSAML\Module;
-use SimpleSAML\SAML2\Constants as SAML2_C;
 use SimpleSAML\SAML11\Constants as C;
 use SimpleSAML\SAML11\XML\saml\Assertion;
 use SimpleSAML\SAML11\XML\saml\Attribute;
@@ -25,18 +24,40 @@
 use SimpleSAML\SAML11\XML\saml\AudienceRestrictionCondition;
 use SimpleSAML\SAML11\XML\saml\AuthenticationStatement;
 use SimpleSAML\SAML11\XML\saml\Conditions;
+use SimpleSAML\SAML11\XML\saml\ConfirmationMethod;
 use SimpleSAML\SAML11\XML\saml\NameIdentifier;
-use SimpleSAML\SAML11\XML\saml\{ConfirmationMethod, Subject, SubjectConfirmation};
+use SimpleSAML\SAML11\XML\saml\Subject;
+use SimpleSAML\SAML11\XML\saml\SubjectConfirmation;
+use SimpleSAML\SAML2\Constants as SAML2_C;
 use SimpleSAML\SOAP\Constants as SOAP_C;
-use SimpleSAML\SOAP\XML\env_200305\{Body, Envelope, Header};
+use SimpleSAML\SOAP\XML\env_200305\Body;
+use SimpleSAML\SOAP\XML\env_200305\Envelope;
+use SimpleSAML\SOAP\XML\env_200305\Header;
 use SimpleSAML\Utils;
-use SimpleSAML\WSSecurity\XML\wsa_200508\{Action, Address, EndpointReference, MessageID, RelatesTo, To};
+use SimpleSAML\WSSecurity\XML\wsa_200508\Action;
+use SimpleSAML\WSSecurity\XML\wsa_200508\Address;
+use SimpleSAML\WSSecurity\XML\wsa_200508\EndpointReference;
+use SimpleSAML\WSSecurity\XML\wsa_200508\MessageID;
+use SimpleSAML\WSSecurity\XML\wsa_200508\RelatesTo;
+use SimpleSAML\WSSecurity\XML\wsa_200508\To;
 use SimpleSAML\WSSecurity\XML\wsp\AppliesTo;
-use SimpleSAML\WSSecurity\XML\wsse\{KeyIdentifier, Password, Security, SecurityTokenReference, Username, UsernameToken};
-use SimpleSAML\WSSecurity\XML\wst_200502\{KeyType, KeyTypeEnum, Lifetime, RequestType, RequestTypeEnum, TokenType};
-use SimpleSAML\WSSecurity\XML\wst_200502\{RequestedSecurityToken, RequestSecurityToken, RequestSecurityTokenResponse};
-use SimpleSAML\WSSecurity\XML\wst_200502\{RequestedAttachedReference, RequestedUnattachedReference};
-use SimpleSAML\WSSecurity\XML\wsu\{Created, Expires, Timestamp};
+use SimpleSAML\WSSecurity\XML\wsse\KeyIdentifier;
+use SimpleSAML\WSSecurity\XML\wsse\Password;
+use SimpleSAML\WSSecurity\XML\wsse\Security;
+use SimpleSAML\WSSecurity\XML\wsse\SecurityTokenReference;
+use SimpleSAML\WSSecurity\XML\wsse\UsernameToken;
+use SimpleSAML\WSSecurity\XML\wst_200502\KeyType;
+use SimpleSAML\WSSecurity\XML\wst_200502\Lifetime;
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestedSecurityToken;
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestedUnattachedReference;
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityToken;
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityTokenResponse;
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestType;
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestTypeEnum;
+use SimpleSAML\WSSecurity\XML\wst_200502\TokenType;
+use SimpleSAML\WSSecurity\XML\wsu\Created;
+use SimpleSAML\WSSecurity\XML\wsu\Expires;
+use SimpleSAML\WSSecurity\XML\wsu\Timestamp;
 use SimpleSAML\XHTML\Template;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
@@ -45,7 +66,8 @@
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
 use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
 use SimpleSAML\XMLSecurity\XML\ds\X509Data;
-use Symfony\Component\HttpFoundation\{Request, StreamedResponse};
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 use function array_pop;
 use function base64_encode;

src/IdP/MetadataBuilder.php

@@ -7,8 +7,10 @@
 use Beste\Clock\LocalizedClock;
 use Exception;
 use Psr\Clock\ClockInterface;
-use SimpleSAML\{Configuration, Logger, Module, Utils};
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\Configuration;
+use SimpleSAML\Logger;
+use SimpleSAML\Module;
 use SimpleSAML\SAML2\Exception\ArrayValidationException;
 use SimpleSAML\SAML2\XML\md\AbstractMetadataDocument;
 use SimpleSAML\SAML2\XML\md\ContactPerson;
@@ -18,22 +20,27 @@
 use SimpleSAML\SAML2\XML\md\Organization;
 use SimpleSAML\SAML2\XML\mdattr\EntityAttributes;
 use SimpleSAML\SAML2\XML\mdrpi\RegistrationInfo;
-use SimpleSAML\SAML2\XML\mdui\{DiscoHints, UIInfo};
-use SimpleSAML\SAML2\XML\saml\{Attribute, AttributeValue};
+use SimpleSAML\SAML2\XML\mdui\DiscoHints;
+use SimpleSAML\SAML2\XML\mdui\UIInfo;
+use SimpleSAML\SAML2\XML\saml\Attribute;
+use SimpleSAML\SAML2\XML\saml\AttributeValue;
 use SimpleSAML\SAML2\XML\shibmd\Scope;
+use SimpleSAML\Utils;
+use SimpleSAML\WSSecurity\Constants as C;
+use SimpleSAML\WSSecurity\XML\fed\PassiveRequestorEndpoint;
+use SimpleSAML\WSSecurity\XML\fed\SecurityTokenServiceEndpoint;
+use SimpleSAML\WSSecurity\XML\fed\SecurityTokenServiceType;
+use SimpleSAML\WSSecurity\XML\fed\TokenType;
+use SimpleSAML\WSSecurity\XML\fed\TokenTypesOffered;
+use SimpleSAML\WSSecurity\XML\wsa_200508\Address;
+use SimpleSAML\WSSecurity\XML\wsa_200508\EndpointReference;
 use SimpleSAML\XML\Chunk;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Key\PrivateKey;
-use SimpleSAML\XMLSecurity\XML\ds\{KeyInfo, KeyName, X509Certificate, X509Data};
-use SimpleSAML\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\fed\{
-    PassiveRequestorEndpoint,
-    SecurityTokenServiceEndpoint,
-    SecurityTokenServiceType,
-    TokenTypesOffered,
-    TokenType,
-};
-use SimpleSAML\WSSecurity\XML\wsa_200508\{Address, EndpointReference};
+use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
+use SimpleSAML\XMLSecurity\XML\ds\KeyName;
+use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
+use SimpleSAML\XMLSecurity\XML\ds\X509Data;
 
 use function array_key_exists;
 use function preg_match;
@@ -48,6 +55,7 @@ class MetadataBuilder
     /** @var \Psr\Clock\ClockInterface */
     protected ClockInterface $clock;
 
+
     /**
      * Constructor.
      *

src/IdP/PassiveIdP.php

@@ -5,11 +5,16 @@
 namespace SimpleSAML\Module\adfs\IdP;
 
 use Exception;
-use SimpleSAML\{Auth, Configuration, Error, Session, Utils};
 use SimpleSAML\Assert\Assert;
-use SimpleSAML\IdP\{IFrameLogoutHandler, LogoutHandlerInterface, TraditionalLogoutHandler};
+use SimpleSAML\Auth;
+use SimpleSAML\Configuration;
+use SimpleSAML\Error;
+use SimpleSAML\IdP\IFrameLogoutHandler;
+use SimpleSAML\IdP\LogoutHandlerInterface;
+use SimpleSAML\IdP\TraditionalLogoutHandler;
 use SimpleSAML\Metadata\MetaDataStorageHandler;
-use Symfony\Component\HttpFoundation\{RedirectResponse, Response};
+use SimpleSAML\Session;
+use Symfony\Component\HttpFoundation\Response;
 
 use function call_user_func;
 use function substr;
@@ -145,7 +150,7 @@ public static function getByState(Configuration $config, array &$state): Passive
     /**
      * Retrieve the configuration for this IdP.
      *
-     * @return Configuration The configuration object.
+     * @return \SimpleSAML\Configuration The configuration object.
      */
     public function getConfig(): Configuration
     {

src/MetadataExchange.php

@@ -6,44 +6,35 @@
 
 use SimpleSAML\Module;
 use SimpleSAML\Module\adfs\Trust;
-use SimpleSAML\WSDL\XML\soap12\{
-    Address as Soap12Address,
-    Binding as Soap12Binding,
-    Body as Soap12Body,
-    Operation as Soap12Operation,
-};
-use SimpleSAML\WSDL\XML\wsdl\{
-    Binding,
-    BindingOperation,
-    BindingOperationInput,
-    BindingOperationOutput,
-    Definitions,
-    Input,
-    Message,
-    Output,
-    Part,
-    Port,
-    PortType,
-    PortTypeOperation,
-    Service,
-    Types,
-};
+use SimpleSAML\WSDL\XML\soap12\Address as Soap12Address;
+use SimpleSAML\WSDL\XML\soap12\Binding as Soap12Binding;
+use SimpleSAML\WSDL\XML\soap12\Body as Soap12Body;
+use SimpleSAML\WSDL\XML\soap12\Operation as Soap12Operation;
+use SimpleSAML\WSDL\XML\wsdl\Binding;
+use SimpleSAML\WSDL\XML\wsdl\BindingOperation;
+use SimpleSAML\WSDL\XML\wsdl\BindingOperationInput;
+use SimpleSAML\WSDL\XML\wsdl\BindingOperationOutput;
+use SimpleSAML\WSDL\XML\wsdl\Definitions;
+use SimpleSAML\WSDL\XML\wsdl\Input;
+use SimpleSAML\WSDL\XML\wsdl\Message;
+use SimpleSAML\WSDL\XML\wsdl\Output;
+use SimpleSAML\WSDL\XML\wsdl\Part;
+use SimpleSAML\WSDL\XML\wsdl\Port;
+use SimpleSAML\WSDL\XML\wsdl\PortType;
+use SimpleSAML\WSDL\XML\wsdl\PortTypeOperation;
+use SimpleSAML\WSDL\XML\wsdl\Service;
 use SimpleSAML\WSSecurity\Constants as C;
-use SimpleSAML\WSSecurity\XML\wsa_200508\{Address, EndpointReference};
+use SimpleSAML\WSSecurity\XML\wsa_200508\Address;
+use SimpleSAML\WSSecurity\XML\wsa_200508\EndpointReference;
 use SimpleSAML\WSSecurity\XML\wsp\PolicyReference;
-use SimpleSAML\WSSecurity\XML\wst_200502\{
-    RequestSecurityToken as RequestSecurityToken2005,
-    RequestSecurityTokenResponse as RequestSecurityTokenResponse2005,
-};
-use SimpleSAML\WSSecurity\XML\wst_200512\{
-    RequestSecurityToken as RequestSecurityToken13,
-    RequestSecurityTokenResponseCollection as RequestSecurityTokenResponseCollection13,
-};
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityToken as RequestSecurityToken2005;
+use SimpleSAML\WSSecurity\XML\wst_200502\RequestSecurityTokenResponse as RequestSecurityTokenResponse2005;
+//use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityToken as RequestSecurityToken13;
+//use SimpleSAML\WSSecurity\XML\wst_200512\RequestSecurityTokenResponseCollection as RequestSecurityTokenResponseCollection13;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 
 //use SimpleSAML\XML\Chunk;
 //use SimpleSAML\XML\DOMDocumentFactory;
-
 use function array_merge;
 use function sprintf;
 

tests/src/Controller/AdfsControllerTest.php

@@ -10,7 +10,8 @@
 use SimpleSAML\Error;
 use SimpleSAML\Module\adfs\Controller;
 use SimpleSAML\Session;
-use Symfony\Component\HttpFoundation\{Request, StreamedResponse};
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 use function dirname;