Skip to content

Commit 10ea8fb

Browse files
tvdijentvdijen
committed
Remove unused use-statements and order them alphabetically
1 parent be09b33 commit 10ea8fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+20
-127
lines changed

‎composer.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@
5050
},
5151
"config": {
5252
"allow-plugins": {
53-
"composer/package-versions-deprecated": true
53+
"composer/package-versions-deprecated": true,
54+
"dealerdirect/phpcodesniffer-composer-installer": true
5455
}
5556
}
5657
}

‎src/Backend/EncryptionBackend.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace SimpleSAML\XMLSecurity\Backend;
66

7-
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
87
use SimpleSAML\XMLSecurity\Key\KeyInterface;
98

109
/**

‎src/Backend/OpenSSL.php

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use SimpleSAML\XMLSecurity\Constants as C;
88
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
99
use SimpleSAML\XMLSecurity\Exception\RuntimeException;
10-
use SimpleSAML\XMLSecurity\Key\KeyInterface;
1110
use SimpleSAML\XMLSecurity\Key\AsymmetricKey;
11+
use SimpleSAML\XMLSecurity\Key\KeyInterface;
1212
use SimpleSAML\XMLSecurity\Key\PrivateKey;
1313
use SimpleSAML\XMLSecurity\Utils\Random;
1414

@@ -18,10 +18,6 @@
1818
use function openssl_decrypt;
1919
use function openssl_encrypt;
2020
use function openssl_error_string;
21-
use function openssl_private_decrypt;
22-
use function openssl_public_decrypt;
23-
use function openssl_private_encrypt;
24-
use function openssl_public_encrypt;
2521
use function openssl_sign;
2622
use function openssl_verify;
2723
use function ord;

‎src/CryptoEncoding/PEMBundle.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
use Countable;
99
use IteratorAggregate;
1010
use LogicException;
11-
use RuntimeException;
1211
use SimpleSAML\XMLSecurity\Exception\IOException;
1312
use UnexpectedValueException;
1413

1514
use function array_map;
1615
use function array_merge;
1716
use function base64_decode;
1817
use function count;
18+
use function file_get_contents;
1919
use function implode;
2020
use function is_readable;
21-
use function file_get_contents;
2221
use function preg_match_all;
2322
use function preg_replace;
2423

‎src/Key/AsymmetricKey.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace SimpleSAML\XMLSecurity\Key;
66

7-
use OpenSSLAsymmetricKey;
87
use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
98

109
/**

‎src/Key/PrivateKey.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace SimpleSAML\XMLSecurity\Key;
66

7-
use OpenSSLAsymmetricKey;
87
use SimpleSAML\Assert\Assert;
98
use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
109
use SimpleSAML\XMLSecurity\Exception\RuntimeException;

‎src/Key/PublicKey.php

-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44

55
namespace SimpleSAML\XMLSecurity\Key;
66

7-
use OpenSSLAsymmetricKey;
87
use SimpleSAML\Assert\Assert;
98
use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
10-
use SimpleSAML\XMLSecurity\Exception\RuntimeException;
119

1210
use function base64_encode;
1311
use function chr;
1412
use function chunk_split;
15-
use function openssl_error_string;
1613
use function ord;
1714
use function pack;
1815
use function sprintf;

‎src/Key/X509Certificate.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace SimpleSAML\XMLSecurity\Key;
66

7-
use OpenSSLCertificate;
87
use SimpleSAML\Assert\Assert;
98
use SimpleSAML\XMLSecurity\Constants as C;
109
use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;

‎src/TestUtils/PEMCertificatesMock.php

-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44

55
namespace SimpleSAML\XMLSecurity\TestUtils;
66

7-
use Exception;
87
use SimpleSAML\XMLSecurity\Key\PrivateKey;
98
use SimpleSAML\XMLSecurity\Key\PublicKey;
109
use SimpleSAML\XMLSecurity\Key\X509Certificate;
1110
use SimpleSAML\XMLSecurity\Utils\Certificate as CertificateUtils;
1211

1312
use function dirname;
1413
use function file_get_contents;
15-
use function preg_match;
16-
use function preg_replace;
1714
use function trim;
1815

1916
/**

‎src/TestUtils/SignedElementTestTrait.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,15 @@
55
namespace SimpleSAML\XMLSecurity\TestUtils;
66

77
use DOMDocument;
8-
use Exception;
98
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
109
use SimpleSAML\XMLSecurity\Constants as C;
1110
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1211
use SimpleSAML\XMLSecurity\Exception\NoSignatureFoundException;
1312
use SimpleSAML\XMLSecurity\Exception\SignatureVerificationFailedException;
14-
use SimpleSAML\XMLSecurity\Exception\UnsupportedAlgorithmException;
15-
use SimpleSAML\XMLSecurity\Key\PrivateKey;
16-
use SimpleSAML\XMLSecurity\Key\X509Certificate as X509;
13+
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1714
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1815
use SimpleSAML\XMLSecurity\XML\ds\X509Certificate;
1916
use SimpleSAML\XMLSecurity\XML\ds\X509Data;
20-
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
21-
use SimpleSAML\XMLSecurity\Utils\Certificate as CertificateUtils;
2217

2318
use function array_keys;
2419
use function boolval;

‎src/Utils/Random.php

-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1111
use SimpleSAML\XMLSecurity\Exception\RuntimeException;
1212

13-
use function bin2hex;
1413
use function random_bytes;
15-
use function substr;
1614

1715
/**
1816
* A collection of utilities to generate cryptographically-secure random data.

‎src/XML/SignableElementTrait.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use SimpleSAML\XML\DOMDocumentFactory;
1010
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmInterface;
1111
use SimpleSAML\XMLSecurity\Constants as C;
12-
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1312
use SimpleSAML\XMLSecurity\Exception\RuntimeException;
1413
use SimpleSAML\XMLSecurity\Exception\UnsupportedAlgorithmException;
1514
use SimpleSAML\XMLSecurity\Utils\Security;

‎src/XML/SignedElementTrait.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
use SimpleSAML\XMLSecurity\Exception\ReferenceValidationFailedException;
1818
use SimpleSAML\XMLSecurity\Exception\RuntimeException;
1919
use SimpleSAML\XMLSecurity\Exception\SignatureVerificationFailedException;
20-
use SimpleSAML\XMLSecurity\Key\KeyInterface;
2120
use SimpleSAML\XMLSecurity\Key;
21+
use SimpleSAML\XMLSecurity\Key\KeyInterface;
2222
use SimpleSAML\XMLSecurity\Utils\Security;
2323
use SimpleSAML\XMLSecurity\Utils\XML;
2424
use SimpleSAML\XMLSecurity\Utils\XPath;

‎src/XML/ds/DsObject.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
use DOMElement;
88
use SimpleSAML\Assert\Assert;
99
use SimpleSAML\XML\Chunk;
10-
use SimpleSAML\XML\XsNamespace as NS;
1110
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1211
use SimpleSAML\XML\ExtendableElementTrait;
13-
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
12+
use SimpleSAML\XML\XsNamespace as NS;
1413

1514
/**
1615
* Class representing a ds:Object element.

‎src/XML/ds/KeyValue.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
use DOMElement;
88
use SimpleSAML\Assert\Assert;
99
use SimpleSAML\XML\Chunk;
10+
use SimpleSAML\XML\ElementInterface;
1011
use SimpleSAML\XML\Exception\InvalidDOMElementException;
11-
use SimpleSAML\XML\Exception\MissingElementException;
1212
use SimpleSAML\XML\Exception\SchemaViolationException;
1313
use SimpleSAML\XML\Exception\TooManyElementsException;
1414
use SimpleSAML\XML\ExtendableElementTrait;
15-
use SimpleSAML\XML\ElementInterface;
1615
use SimpleSAML\XML\XsNamespace as NS;
17-
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1816

1917
/**
2018
* Class representing a ds:KeyValue element.

‎src/XML/ds/RSAKeyValue.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1010
use SimpleSAML\XML\Exception\MissingElementException;
1111
use SimpleSAML\XML\Exception\TooManyElementsException;
12-
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1312

1413
/**
1514
* Class representing a ds:RSAKeyValue element.

‎src/XML/ds/SignatureProperties.php

-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66

77
use DOMElement;
88
use SimpleSAML\Assert\Assert;
9-
use SimpleSAML\XML\Chunk;
109
use SimpleSAML\XML\Constants as C;
1110
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1211
use SimpleSAML\XML\Exception\MissingElementException;
1312
use SimpleSAML\XML\Exception\SchemaViolationException;
14-
use SimpleSAML\XML\ExtendableElementTrait;
15-
use SimpleSAML\XML\SerializableElementInterface;
1613

1714
/**
1815
* Class representing a ds:SignatureProperties element.

‎src/XML/ds/SignatureProperty.php

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use SimpleSAML\XML\Exception\MissingElementException;
1212
use SimpleSAML\XML\Exception\SchemaViolationException;
1313
use SimpleSAML\XML\ExtendableElementTrait;
14-
use SimpleSAML\XML\SerializableElementInterface;
1514
use SimpleSAML\XML\XsNamespace as NS;
1615

1716
/**

‎src/XML/ds/SignatureValue.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
use DOMElement;
88
use SimpleSAML\Assert\Assert;
9-
use SimpleSAML\XML\Exception\InvalidDOMElementException;
109
use SimpleSAML\XML\Base64ElementTrait;
10+
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1111

1212
/**
1313
* Class representing a ds:SignatureValue element.

‎src/XML/ds/X509IssuerSerial.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1010
use SimpleSAML\XML\Exception\MissingElementException;
1111
use SimpleSAML\XML\Exception\TooManyElementsException;
12-
use SimpleSAML\XML\Utils as XMLUtils;
1312

1413
use function array_pop;
1514

‎src/XML/ds/X509SerialNumber.php

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use DOMElement;
88
use SimpleSAML\Assert\Assert;
9-
use SimpleSAML\XML\Constants as C;
109
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1110
use SimpleSAML\XML\Exception\SchemaViolationException;
1211
use SimpleSAML\XML\StringElementTrait;

‎src/XML/ds/XPath.php

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1212
use SimpleSAML\XMLSecurity\Utils\XPath as XPathUtils;
1313

14-
use function str_replace;
15-
1614
/**
1715
* Class implementing the XPath element.
1816
*

‎src/XML/dsig11/KeyInfoReference.php

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
use SimpleSAML\Assert\Assert;
99
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1010
use SimpleSAML\XML\Exception\SchemaViolationException;
11-
use SimpleSAML\XMLSecurity\Constants as C;
12-
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1311

1412
/**
1513
* Class representing a dsig11:KeyInfoReference element.

‎src/XML/dsig11/X509Digest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
use DOMElement;
88
use SimpleSAML\Assert\Assert;
9+
use SimpleSAML\XML\Base64ElementTrait;
910
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1011
use SimpleSAML\XML\Exception\SchemaViolationException;
1112
use SimpleSAML\XMLSecurity\Constants as C;
1213
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
13-
use SimpleSAML\XML\Base64ElementTrait;
1414

1515
/**
1616
* Class representing a dsig11:X509Digest element.

‎src/XML/xenc/AbstractEncryptedType.php

-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
use SimpleSAML\XML\Exception\SchemaViolationException;
1010
use SimpleSAML\XMLSecurity\XML\ds\KeyInfo;
1111

12-
use function count;
13-
1412
/**
1513
* Abstract class representing encrypted data.
1614
*

‎src/XML/xenc/AbstractEncryptionMethod.php

-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@
1313
use SimpleSAML\XML\ExtendableElementTrait;
1414
use SimpleSAML\XML\XsNamespace as NS;
1515
use SimpleSAML\XMLSecurity\Constants as C;
16-
use SimpleSAML\XMLSecurity\Exception\InvalidArgumentException;
1716

1817
use function array_pop;
19-
use function sprintf;
2018

2119
/**
2220
* A class implementing the xenc:AbstractEncryptionMethod element.

‎src/XML/xenc/AbstractReference.php

-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
use DOMElement;
88
use SimpleSAML\Assert\Assert;
99
use SimpleSAML\XML\Chunk;
10-
use SimpleSAML\XML\ElementInterface;
1110
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1211
use SimpleSAML\XML\Exception\SchemaViolationException;
1312
use SimpleSAML\XML\ExtendableElementTrait;
1413
use SimpleSAML\XML\XsNamespace as NS;
15-
use SimpleSAML\XMLSecurity\XML\xenc\Transforms;
1614

1715
/**
1816
* Abstract class representing references. No custom elements are allowed.

‎src/XML/xenc/CipherData.php

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use SimpleSAML\Assert\Assert;
99
use SimpleSAML\XML\Exception\InvalidDOMElementException;
1010
use SimpleSAML\XML\Exception\TooManyElementsException;
11-
use SimpleSAML\XMLSecurity\Utils\XPath;
1211

1312
use function array_pop;
1413

‎tests/Alg/Signature/HMACSignatureTest.php

-6
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,9 @@
55
namespace SimpleSAML\XMLSecurity\Test\Alg\Signature;
66

77
use PHPUnit\Framework\TestCase;
8-
use SimpleSAML\XMLSecurity\Alg\Signature\HMAC;
98
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
109
use SimpleSAML\XMLSecurity\Constants as C;
11-
use SimpleSAML\XMLSecurity\Key\PrivateKey;
12-
use SimpleSAML\XMLSecurity\Key\PublicKey;
1310
use SimpleSAML\XMLSecurity\Key\SymmetricKey;
14-
use SimpleSAML\XMLSecurity\Key\X509Certificate;
15-
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
16-
use TypeError;
1711

1812
use function bin2hex;
1913
use function hex2bin;

‎tests/Alg/Signature/RSASignatureTest.php

-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@
55
namespace SimpleSAML\XMLSecurity\Test\Alg\Signature;
66

77
use PHPUnit\Framework\TestCase;
8-
use SimpleSAML\XMLSecurity\Alg\Signature\RSA;
98
use SimpleSAML\XMLSecurity\Alg\Signature\SignatureAlgorithmFactory;
109
use SimpleSAML\XMLSecurity\Constants as C;
1110
use SimpleSAML\XMLSecurity\Key\PrivateKey;
1211
use SimpleSAML\XMLSecurity\Key\PublicKey;
13-
use SimpleSAML\XMLSecurity\Key\SymmetricKey;
14-
use SimpleSAML\XMLSecurity\Key\X509Certificate;
1512
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
16-
use TypeError;
1713

1814
use function bin2hex;
1915
use function hex2bin;

‎tests/Backend/OpenSSLTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
use SimpleSAML\XMLSecurity\Key\PublicKey;
1414
use SimpleSAML\XMLSecurity\Key\SymmetricKey;
1515

16-
use function dirname;
1716
use function bin2hex;
17+
use function dirname;
1818
use function hex2bin;
1919

2020
/**

‎tests/CryptoEncoding/PEMBundleTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
use LogicException;
88
use PHPUnit\Framework\TestCase;
9-
use RuntimeException;
109
use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
1110
use SimpleSAML\XMLSecurity\CryptoEncoding\PEMBundle;
1211
use SimpleSAML\XMLSecurity\Exception\IOException;

‎tests/Key/PublicKeyTest.php

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use SimpleSAML\XMLSecurity\Key\PublicKey;
1111
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1212

13-
use function file_get_contents;
1413
use function openssl_pkey_get_details;
1514
use function openssl_pkey_get_public;
1615

‎tests/Key/X509CertificateTest.php

-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@
55
namespace SimpleSAML\XMLSecurity\Test\Key;
66

77
use PHPUnit\Framework\TestCase;
8-
use ReflectionMethod;
9-
use SimpleSAML\XMLSecurity\Constants as C;
108
use SimpleSAML\XMLSecurity\CryptoEncoding\PEM;
119
use SimpleSAML\XMLSecurity\Exception\UnsupportedAlgorithmException;
1210
use SimpleSAML\XMLSecurity\Key\X509Certificate;
1311
use SimpleSAML\XMLSecurity\TestUtils\PEMCertificatesMock;
1412

15-
use function file_get_contents;
1613
use function openssl_pkey_get_details;
1714
use function openssl_pkey_get_public;
1815
use function openssl_x509_fingerprint;

0 commit comments

Comments
 (0)