Remove unused use-statements and order them alphabetically

simplesamlphp · Jan 11, 2024 · 10ea8fb · 10ea8fb
1 parent be09b33
commit 10ea8fb
Show file tree

Hide file tree

Showing 64 changed files with 20 additions and 127 deletions.
diff --git a/composer.json b/composer.json
@@ -50,7 +50,8 @@
     },
     "config": {
         "allow-plugins": {
-            "composer/package-versions-deprecated": true
+            "composer/package-versions-deprecated": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     }
 }
diff --git a/src/Backend/EncryptionBackend.php b/src/Backend/EncryptionBackend.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\XMLSecurity\Backend;
 
-use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\Key\KeyInterface;
 
 /**

diff --git a/src/Backend/OpenSSL.php b/src/Backend/OpenSSL.php
@@ -7,8 +7,8 @@
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\Exception\RuntimeException;
-use SimpleSAML\XMLSecurity\Key\KeyInterface;
 use SimpleSAML\XMLSecurity\Key\AsymmetricKey;
+use SimpleSAML\XMLSecurity\Key\KeyInterface;
 use SimpleSAML\XMLSecurity\Key\PrivateKey;
 use SimpleSAML\XMLSecurity\Utils\Random;
 
@@ -18,10 +18,6 @@
 use function openssl_decrypt;
 use function openssl_encrypt;
 use function openssl_error_string;
-use function openssl_private_decrypt;
-use function openssl_public_decrypt;
-use function openssl_private_encrypt;
-use function openssl_public_encrypt;
 use function openssl_sign;
 use function openssl_verify;
 use function ord;

diff --git a/src/CryptoEncoding/PEMBundle.php b/src/CryptoEncoding/PEMBundle.php
@@ -8,17 +8,16 @@
 use Countable;
 use IteratorAggregate;
 use LogicException;
-use RuntimeException;
 use SimpleSAML\XMLSecurity\Exception\IOException;
 use UnexpectedValueException;
 
 use function array_map;
 use function array_merge;
 use function base64_decode;
 use function count;
+use function file_get_contents;
 use function implode;
 use function is_readable;
-use function file_get_contents;
 use function preg_match_all;
 use function preg_replace;
 

diff --git a/src/Key/AsymmetricKey.php b/src/Key/AsymmetricKey.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\XMLSecurity\Key;
 
-use OpenSSLAsymmetricKey;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
 
 /**

diff --git a/src/Key/PrivateKey.php b/src/Key/PrivateKey.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\XMLSecurity\Key;
 
-use OpenSSLAsymmetricKey;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
 use SimpleSAML\XMLSecurity\Exception\RuntimeException;

diff --git a/src/Key/PublicKey.php b/src/Key/PublicKey.php
@@ -4,15 +4,12 @@
 
 namespace SimpleSAML\XMLSecurity\Key;
 
-use OpenSSLAsymmetricKey;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
-use SimpleSAML\XMLSecurity\Exception\RuntimeException;
 
 use function base64_encode;
 use function chr;
 use function chunk_split;
-use function openssl_error_string;
 use function ord;
 use function pack;
 use function sprintf;

diff --git a/src/Key/X509Certificate.php b/src/Key/X509Certificate.php
@@ -4,7 +4,6 @@
 
 namespace SimpleSAML\XMLSecurity\Key;
 
-use OpenSSLCertificate;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;

diff --git a/src/TestUtils/PEMCertificatesMock.php b/src/TestUtils/PEMCertificatesMock.php
@@ -4,16 +4,13 @@
 
 namespace SimpleSAML\XMLSecurity\TestUtils;
 
-use Exception;
 use SimpleSAML\XMLSecurity\Key\PrivateKey;
 use SimpleSAML\XMLSecurity\Key\PublicKey;
 use SimpleSAML\XMLSecurity\Key\X509Certificate;
 use SimpleSAML\XMLSecurity\Utils\Certificate as CertificateUtils;
 
 use function dirname;
 use function file_get_contents;
-use function preg_match;
-use function preg_replace;
 use function trim;
 
 /**

diff --git a/src/TestUtils/SignedElementTestTrait.php b/src/TestUtils/SignedElementTestTrait.php
@@ -5,20 +5,15 @@
 namespace SimpleSAML\XMLSecurity\TestUtils;
 
 use DOMDocument;
-use Exception;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\Exception\NoSignatureFoundException;
 use SimpleSAML\XMLSecurity\Exception\SignatureVerificationFailedException;
-use SimpleSAML\XMLSecurity\Exception\UnsupportedAlgorithmException;
-use SimpleSAML\XMLSecurity\Key\PrivateKey;
-use SimpleSAML\XMLSecurity\Key\X509Certificate as X509;
+use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
 use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
 use SimpleSAML\XMLSecurity\XML\ds\X509Data;
-use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
-use SimpleSAML\XMLSecurity\Utils\Certificate as CertificateUtils;
 
 use function array_keys;
 use function boolval;

diff --git a/src/Utils/Random.php b/src/Utils/Random.php
@@ -10,9 +10,7 @@
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\Exception\RuntimeException;
 
-use function bin2hex;
 use function random_bytes;
-use function substr;
 
 /**
  * A collection of utilities to generate cryptographically-secure random data.

diff --git a/src/XML/SignableElementTrait.php b/src/XML/SignableElementTrait.php
@@ -9,7 +9,6 @@
 use SimpleSAML\XML\DOMDocumentFactory;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmInterface;
 use SimpleSAML\XMLSecurity\Constants as C;
-use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\Exception\RuntimeException;
 use SimpleSAML\XMLSecurity\Exception\UnsupportedAlgorithmException;
 use SimpleSAML\XMLSecurity\Utils\Security;

diff --git a/src/XML/SignedElementTrait.php b/src/XML/SignedElementTrait.php
@@ -17,8 +17,8 @@
 use SimpleSAML\XMLSecurity\Exception\ReferenceValidationFailedException;
 use SimpleSAML\XMLSecurity\Exception\RuntimeException;
 use SimpleSAML\XMLSecurity\Exception\SignatureVerificationFailedException;
-use SimpleSAML\XMLSecurity\Key\KeyInterface;
 use SimpleSAML\XMLSecurity\Key;
+use SimpleSAML\XMLSecurity\Key\KeyInterface;
 use SimpleSAML\XMLSecurity\Utils\Security;
 use SimpleSAML\XMLSecurity\Utils\XML;
 use SimpleSAML\XMLSecurity\Utils\XPath;

diff --git a/src/XML/ds/DsObject.php b/src/XML/ds/DsObject.php
@@ -7,10 +7,9 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Chunk;
-use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\ExtendableElementTrait;
-use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
+use SimpleSAML\XML\XsNamespace as NS;
 
 /**
  * Class representing a ds:Object element.

diff --git a/src/XML/ds/KeyValue.php b/src/XML/ds/KeyValue.php
@@ -7,14 +7,12 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Chunk;
+use SimpleSAML\XML\ElementInterface;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
-use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
 use SimpleSAML\XML\ExtendableElementTrait;
-use SimpleSAML\XML\ElementInterface;
 use SimpleSAML\XML\XsNamespace as NS;
-use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
 /**
  * Class representing a ds:KeyValue element.

diff --git a/src/XML/ds/RSAKeyValue.php b/src/XML/ds/RSAKeyValue.php
@@ -9,7 +9,6 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
-use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
 /**
  * Class representing a ds:RSAKeyValue element.

diff --git a/src/XML/ds/SignatureProperties.php b/src/XML/ds/SignatureProperties.php
@@ -6,13 +6,10 @@
 
 use DOMElement;
 use SimpleSAML\Assert\Assert;
-use SimpleSAML\XML\Chunk;
 use SimpleSAML\XML\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XML\ExtendableElementTrait;
-use SimpleSAML\XML\SerializableElementInterface;
 
 /**
  * Class representing a ds:SignatureProperties element.

diff --git a/src/XML/ds/SignatureProperty.php b/src/XML/ds/SignatureProperty.php
@@ -11,7 +11,6 @@
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
-use SimpleSAML\XML\SerializableElementInterface;
 use SimpleSAML\XML\XsNamespace as NS;
 
 /**

diff --git a/src/XML/ds/SignatureValue.php b/src/XML/ds/SignatureValue.php
@@ -6,8 +6,8 @@
 
 use DOMElement;
 use SimpleSAML\Assert\Assert;
-use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Base64ElementTrait;
+use SimpleSAML\XML\Exception\InvalidDOMElementException;
 
 /**
  * Class representing a ds:SignatureValue element.

diff --git a/src/XML/ds/X509IssuerSerial.php b/src/XML/ds/X509IssuerSerial.php
@@ -9,7 +9,6 @@
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\MissingElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
-use SimpleSAML\XML\Utils as XMLUtils;
 
 use function array_pop;
 

diff --git a/src/XML/ds/X509SerialNumber.php b/src/XML/ds/X509SerialNumber.php
@@ -6,7 +6,6 @@
 
 use DOMElement;
 use SimpleSAML\Assert\Assert;
-use SimpleSAML\XML\Constants as C;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\StringElementTrait;

diff --git a/src/XML/ds/XPath.php b/src/XML/ds/XPath.php
@@ -11,8 +11,6 @@
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 use SimpleSAML\XMLSecurity\Utils\XPath as XPathUtils;
 
-use function str_replace;
-
 /**
  * Class implementing the XPath element.
  *

diff --git a/src/XML/dsig11/KeyInfoReference.php b/src/XML/dsig11/KeyInfoReference.php
@@ -8,8 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
-use SimpleSAML\XMLSecurity\Constants as C;
-use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
 /**
  * Class representing a dsig11:KeyInfoReference element.

diff --git a/src/XML/dsig11/X509Digest.php b/src/XML/dsig11/X509Digest.php
@@ -6,11 +6,11 @@
 
 use DOMElement;
 use SimpleSAML\Assert\Assert;
+use SimpleSAML\XML\Base64ElementTrait;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
-use SimpleSAML\XML\Base64ElementTrait;
 
 /**
  * Class representing a dsig11:X509Digest element.

diff --git a/src/XML/xenc/AbstractEncryptedType.php b/src/XML/xenc/AbstractEncryptedType.php
@@ -9,8 +9,6 @@
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
 
-use function count;
-
 /**
  * Abstract class representing encrypted data.
  *

diff --git a/src/XML/xenc/AbstractEncryptionMethod.php b/src/XML/xenc/AbstractEncryptionMethod.php
@@ -13,10 +13,8 @@
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
 use SimpleSAML\XMLSecurity\Constants as C;
-use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
 
 use function array_pop;
-use function sprintf;
 
 /**
  * A class implementing the xenc:AbstractEncryptionMethod element.

diff --git a/src/XML/xenc/AbstractReference.php b/src/XML/xenc/AbstractReference.php
@@ -7,12 +7,10 @@
 use DOMElement;
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Chunk;
-use SimpleSAML\XML\ElementInterface;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\SchemaViolationException;
 use SimpleSAML\XML\ExtendableElementTrait;
 use SimpleSAML\XML\XsNamespace as NS;
-use SimpleSAML\XMLSecurity\XML\xenc\Transforms;
 
 /**
  * Abstract class representing references. No custom elements are allowed.

diff --git a/src/XML/xenc/CipherData.php b/src/XML/xenc/CipherData.php
@@ -8,7 +8,6 @@
 use SimpleSAML\Assert\Assert;
 use SimpleSAML\XML\Exception\InvalidDOMElementException;
 use SimpleSAML\XML\Exception\TooManyElementsException;
-use SimpleSAML\XMLSecurity\Utils\XPath;
 
 use function array_pop;
 

diff --git a/tests/Alg/Signature/HMACSignatureTest.php b/tests/Alg/Signature/HMACSignatureTest.php
@@ -5,15 +5,9 @@
 namespace SimpleSAML\XMLSecurity\Test\Alg\Signature;
 
 use PHPUnit\Framework\TestCase;
-use SimpleSAML\XMLSecurity\Alg\Signature\HMAC;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Constants as C;
-use SimpleSAML\XMLSecurity\Key\PrivateKey;
-use SimpleSAML\XMLSecurity\Key\PublicKey;
 use SimpleSAML\XMLSecurity\Key\SymmetricKey;
-use SimpleSAML\XMLSecurity\Key\X509Certificate;
-use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
-use TypeError;
 
 use function bin2hex;
 use function hex2bin;

diff --git a/tests/Alg/Signature/RSASignatureTest.php b/tests/Alg/Signature/RSASignatureTest.php
@@ -5,15 +5,11 @@
 namespace SimpleSAML\XMLSecurity\Test\Alg\Signature;
 
 use PHPUnit\Framework\TestCase;
-use SimpleSAML\XMLSecurity\Alg\Signature\RSA;
 use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
 use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\Key\PrivateKey;
 use SimpleSAML\XMLSecurity\Key\PublicKey;
-use SimpleSAML\XMLSecurity\Key\SymmetricKey;
-use SimpleSAML\XMLSecurity\Key\X509Certificate;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
-use TypeError;
 
 use function bin2hex;
 use function hex2bin;

diff --git a/tests/Backend/OpenSSLTest.php b/tests/Backend/OpenSSLTest.php
@@ -13,8 +13,8 @@
 use SimpleSAML\XMLSecurity\Key\PublicKey;
 use SimpleSAML\XMLSecurity\Key\SymmetricKey;
 
-use function dirname;
 use function bin2hex;
+use function dirname;
 use function hex2bin;
 
 /**

diff --git a/tests/CryptoEncoding/PEMBundleTest.php b/tests/CryptoEncoding/PEMBundleTest.php
@@ -6,7 +6,6 @@
 
 use LogicException;
 use PHPUnit\Framework\TestCase;
-use RuntimeException;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEMBundle;
 use SimpleSAML\XMLSecurity\Exception\IOException;

diff --git a/tests/Key/PublicKeyTest.php b/tests/Key/PublicKeyTest.php
@@ -10,7 +10,6 @@
 use SimpleSAML\XMLSecurity\Key\PublicKey;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
 
-use function file_get_contents;
 use function openssl_pkey_get_details;
 use function openssl_pkey_get_public;
 

diff --git a/tests/Key/X509CertificateTest.php b/tests/Key/X509CertificateTest.php
@@ -5,14 +5,11 @@
 namespace SimpleSAML\XMLSecurity\Test\Key;
 
 use PHPUnit\Framework\TestCase;
-use ReflectionMethod;
-use SimpleSAML\XMLSecurity\Constants as C;
 use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
 use SimpleSAML\XMLSecurity\Exception\UnsupportedAlgorithmException;
 use SimpleSAML\XMLSecurity\Key\X509Certificate;
 use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
 
-use function file_get_contents;
 use function openssl_pkey_get_details;
 use function openssl_pkey_get_public;
 use function openssl_x509_fingerprint;
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ @@
     namespace SimpleSAML\XMLSecurity\Backend;
-    use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
     use SimpleSAML\XMLSecurity\Key\KeyInterface;
     /**
@@ Expand Down @@