Fix codesniffer issues

Author: tvdijen

src/IdP/MetadataBuilder.php

@@ -37,8 +37,8 @@
 use SimpleSAML\WebServices\Federation\XML\fed\TokenTypesOffered;
 use SimpleSAML\WebServices\Trust\Constants as C_TRUST;
 use SimpleSAML\XML\Chunk;
-use SimpleSAML\XMLSecurity\Constants as C_XMLSEC;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
+use SimpleSAML\XMLSecurity\Constants as C_XMLSEC;
 use SimpleSAML\XMLSecurity\Key\PrivateKey;
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
 use SimpleSAML\XMLSecurity\XML\ds\KeyName;

src/MetadataExchange.php

@@ -6,6 +6,15 @@
 
 use SimpleSAML\Module;
 use SimpleSAML\Module\adfs\Trust;
+use SimpleSAML\WebServices\Addressing\Constants as C;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\Address;
+use SimpleSAML\WebServices\Addressing\XML\wsa_200508\EndpointReference;
+use SimpleSAML\WebServices\Policy\XML\wsp_200409\PolicyReference;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityToken as RequestSecurityToken2005;
+use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityTokenResponse as RequestSecurityTokenResponse2005;
+//use SimpleSAML\WebServices\Trust\XML\wst_200512\RequestSecurityToken as RequestSecurityToken13;
+//use SimpleSAML\WebServices\Trust\XML\wst_200512\RequestSecurityTokenResponseCollection as \
+//RequestSecurityTokenResponseCollection13;
 use SimpleSAML\WSDL\XML\soap12\Address as Soap12Address;
 use SimpleSAML\WSDL\XML\soap12\Binding as Soap12Binding;
 use SimpleSAML\WSDL\XML\soap12\Body as Soap12Body;
@@ -23,15 +32,6 @@
 use SimpleSAML\WSDL\XML\wsdl\PortType;
 use SimpleSAML\WSDL\XML\wsdl\PortTypeOperation;
 use SimpleSAML\WSDL\XML\wsdl\Service;
-use SimpleSAML\WebServices\Addressing\Constants as C;
-use SimpleSAML\WebServices\Addressing\XML\wsa_200508\Address;
-use SimpleSAML\WebServices\Addressing\XML\wsa_200508\EndpointReference;
-use SimpleSAML\WebServices\Policy\XML\wsp_200409\PolicyReference;
-use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityToken as RequestSecurityToken2005;
-use SimpleSAML\WebServices\Trust\XML\wst_200502\RequestSecurityTokenResponse as RequestSecurityTokenResponse2005;
-//use SimpleSAML\WebServices\Trust\XML\wst_200512\RequestSecurityToken as RequestSecurityToken13;
-//use SimpleSAML\WebServices\Trust\XML\wst_200512\RequestSecurityTokenResponseCollection as \
-//RequestSecurityTokenResponseCollection13;
 use SimpleSAML\XML\Attribute as XMLAttribute;
 
 //use SimpleSAML\XML\Chunk;

src/Trust/Policy13.php

@@ -11,7 +11,6 @@
 use SimpleSAML\WebServices\Policy\XML\wsp_200409\ExactlyOne;
 use SimpleSAML\WebServices\Policy\XML\wsp_200409\Policy;
 use SimpleSAML\WebServices\Security\Type\IDValue;
-use SimpleSAML\WebServices\SecurityPolicy\Constants as C_SECPOL;
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\AlgorithmSuite;
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\Basic256;
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200702\EndorsingSupportingTokens;

src/Trust/Policy2005.php

@@ -11,7 +11,6 @@
 use SimpleSAML\WebServices\Policy\XML\wsp_200409\ExactlyOne;
 use SimpleSAML\WebServices\Policy\XML\wsp_200409\Policy;
 use SimpleSAML\WebServices\Security\Type\IDValue;
-use SimpleSAML\WebServices\SecurityPolicy\Constants as C_SECPOL;
 use SimpleSAML\WebServices\SecurityPolicy\XML\mssp\RsaToken;
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\AlgorithmSuite;
 use SimpleSAML\WebServices\SecurityPolicy\XML\sp_200507\Basic256;
@@ -366,7 +365,9 @@ private function getIssuedTokenWSTrustBinding(): Policy
                                 new KeyType(AnyURIValue::fromString(KeyTypeEnum::PublicKey->value)),
                                 new EncryptWith(AnyURIValue::fromString(C_XMLSEC::KEY_TRANSPORT_OAEP_MGF1P)),
                                 new SignatureAlgorithm(AnyURIValue::fromString(C_XMLSEC::SIG_RSA_SHA1)),
-                                new CanonicalizationAlgorithm(AnyURIValue::fromString(C_XMLSEC::C14N_EXCLUSIVE_WITHOUT_COMMENTS)),
+                                new CanonicalizationAlgorithm(
+                                    AnyURIValue::fromString(C_XMLSEC::C14N_EXCLUSIVE_WITHOUT_COMMENTS),
+                                ),
                                 new EncryptionAlgorithm(AnyURIValue::fromString(C_XMLSEC::BLOCK_ENC_AES256)),
                             ],
                         ),
@@ -473,7 +474,9 @@ private function getIssuedTokenWSTrustBinding1(): Policy
                                 new KeySize(UnsignedIntValue::fromInteger(256)),
                                 new EncryptWith(AnyURIValue::fromString(C_XMLSEC::BLOCK_ENC_AES256)),
                                 new SignatureAlgorithm(AnyURIValue::fromString(C_XMLSEC::SIG_HMAC_SHA1)),
-                                new CanonicalizationAlgorithm(AnyURIValue::fromString(C_XMLSEC::C14N_EXCLUSIVE_WITHOUT_COMMENTS)),
+                                new CanonicalizationAlgorithm(
+                                    AnyURIValue::fromString(C_XMLSEC::C14N_EXCLUSIVE_WITHOUT_COMMENTS),
+                                ),
                                 new EncryptionAlgorithm(AnyURIValue::fromString(C_XMLSEC::BLOCK_ENC_AES256)),
                             ],
                         ),