Merge pull request #307 from stof/clean_use_statements

pitbulk · web-flow · commit 1d00b82dd58f · 2018-04-26T11:58:44.000+02:00
Clean use statements
diff --git a/src/Saml2/Auth.php b/src/Saml2/Auth.php
@@ -15,15 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\AuthnRequest;
-use OneLogin\Saml2\Constants;
-use OneLogin\Saml2\Error;
-use OneLogin\Saml2\LogoutRequest;
-use OneLogin\Saml2\LogoutResponse;
-use OneLogin\Saml2\Response;
-use OneLogin\Saml2\Settings;
-use OneLogin\Saml2\Utils;
-
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 
 use Exception;
diff --git a/src/Saml2/AuthnRequest.php b/src/Saml2/AuthnRequest.php
@@ -15,10 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Constants;
-use OneLogin\Saml2\Settings;
-use OneLogin\Saml2\Utils;
-
 /**
  * SAML 2 Authentication Request
  */
diff --git a/src/Saml2/IdPMetadataParser.php b/src/Saml2/IdPMetadataParser.php
@@ -15,8 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Utils;
-
 use DOMDocument;
 use Exception;
 
diff --git a/src/Saml2/LogoutRequest.php b/src/Saml2/LogoutRequest.php
@@ -15,10 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Settings;
-use OneLogin\Saml2\Utils;
-use OneLogin\Saml2\ValidationError;
-
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 
 use DOMDocument;
diff --git a/src/Saml2/LogoutResponse.php b/src/Saml2/LogoutResponse.php
@@ -15,10 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Settings;
-use OneLogin\Saml2\Utils;
-use OneLogin\Saml2\ValidationError;
-
 use DOMDocument;
 use DOMNodeList;
 use Exception;
diff --git a/src/Saml2/Metadata.php b/src/Saml2/Metadata.php
@@ -15,8 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Utils;
-
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 use RobRichards\XMLSecLibs\XMLSecurityDSig;
 
diff --git a/src/Saml2/Response.php b/src/Saml2/Response.php
@@ -15,9 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Settings;
-use OneLogin\Saml2\Utils;
-
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 use RobRichards\XMLSecLibs\XMLSecEnc;
 
@@ -195,7 +192,7 @@ public function isValid($requestId = null)
                 }
 
                 $currentURL = Utils::getSelfRoutedURLNoQuery();
-                
+
                 if ($this->document->documentElement->hasAttribute('InResponseTo')) {
                     $responseInResponseTo = $this->document->documentElement->getAttribute('InResponseTo');
                 }
@@ -372,7 +369,7 @@ public function isValid($requestId = null)
                         ValidationError::NO_SIGNED_ASSERTION
                     );
                 }
-                
+
                 if ($security['wantMessagesSigned'] && !$hasSignedResponse) {
                     throw new ValidationError(
                         "The Message of the Response is not signed and the SP requires it",
@@ -1088,7 +1085,7 @@ protected function decryptAssertion(\DomNode $dom)
                 $objKeyInfo->loadKey($pem, false, false);
             }
         }
-                
+
         if (empty($objKey->key)) {
             $objKey->loadKey($key);
         }
diff --git a/src/Saml2/Settings.php b/src/Saml2/Settings.php
@@ -15,9 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Utils;
-use OneLogin\Saml2\Error;
-
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 use RobRichards\XMLSecLibs\XMLSecurityDSig;
 
diff --git a/src/Saml2/Utils.php b/src/Saml2/Utils.php
@@ -15,9 +15,6 @@
 
 namespace OneLogin\Saml2;
 
-use OneLogin\Saml2\Error;
-use OneLogin\Saml2\ValidationError;
-
 use RobRichards\XMLSecLibs\XMLSecurityKey;
 use RobRichards\XMLSecLibs\XMLSecurityDSig;
 use RobRichards\XMLSecLibs\XMLSecEnc;
diff --git a/tests/src/OneLogin/Saml2/AuthTest.php b/tests/src/OneLogin/Saml2/AuthTest.php
@@ -2,7 +2,6 @@
 
 namespace OneLogin\Saml2\Tests;
 
-use OneLogin\Saml2\AuthnRequest;
 use OneLogin\Saml2\Auth;
 use OneLogin\Saml2\Error;
 use OneLogin\Saml2\LogoutRequest;
diff --git a/tests/src/OneLogin/Saml2/LogoutRequestTest.php b/tests/src/OneLogin/Saml2/LogoutRequestTest.php
@@ -9,7 +9,6 @@
 use OneLogin\Saml2\ValidationError;
 
 use DomDocument;
-use Exception;
 
 /**
  * Unit tests for Logout Request
@@ -850,7 +849,7 @@ public function testGetXML()
         $logoutRequest = new LogoutRequest($settings);
         $xml = $logoutRequest->getXML();
         $this->assertRegExp('#^<samlp:LogoutRequest#', $xml);
-    
+
         $logoutRequestProcessed = new LogoutRequest($settings, base64_encode($xml));
         $xml2 = $logoutRequestProcessed->getXML();
         $this->assertRegExp('#^<samlp:LogoutRequest#', $xml2);
@@ -871,7 +870,7 @@ public function testGetID()
         $xml = $logoutRequest->getXML();
         $id1 = LogoutRequest::getID($xml);
         $this->assertNotNull($id1);
-    
+
         $logoutRequestProcessed = new LogoutRequest($settings, base64_encode($xml));
         $id2 = $logoutRequestProcessed->id;
         $this->assertEquals($id1, $id2);
diff --git a/tests/src/OneLogin/Saml2/SignedResponseTest.php b/tests/src/OneLogin/Saml2/SignedResponseTest.php
@@ -4,7 +4,6 @@
 
 use OneLogin\Saml2\Response;
 use OneLogin\Saml2\Settings;
-use OneLogin\Saml2\Utils;
 
 /**
  * Unit tests for Response messages signed

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,6 @@`
`15`	`15`
`16`	`16`	`namespace OneLogin\Saml2;`
`17`	`17`
`18`		`-use OneLogin\Saml2\Settings;`
`19`		`-use OneLogin\Saml2\Utils;`
`20`		`-`
`21`	`18`	`use RobRichards\XMLSecLibs\XMLSecurityKey;`
`22`	`19`	`use RobRichards\XMLSecLibs\XMLSecEnc;`
`23`	`20`
`@@ -195,7 +192,7 @@ public function isValid($requestId = null)`
`195`	`192`	`}`
`196`	`193`
`197`	`194`	`$currentURL = Utils::getSelfRoutedURLNoQuery();`
`198`		`-`
	`195`	`+`
`199`	`196`	`if ($this->document->documentElement->hasAttribute('InResponseTo')) {`
`200`	`197`	`$responseInResponseTo = $this->document->documentElement->getAttribute('InResponseTo');`
`201`	`198`	`}`
`@@ -372,7 +369,7 @@ public function isValid($requestId = null)`
`372`	`369`	`ValidationError::NO_SIGNED_ASSERTION`
`373`	`370`	`);`
`374`	`371`	`}`
`375`		`-`
	`372`	`+`
`376`	`373`	`if ($security['wantMessagesSigned'] && !$hasSignedResponse) {`
`377`	`374`	`throw new ValidationError(`
`378`	`375`	`"The Message of the Response is not signed and the SP requires it",`
`@@ -1088,7 +1085,7 @@ protected function decryptAssertion(\DomNode $dom)`
`1088`	`1085`	`$objKeyInfo->loadKey($pem, false, false);`
`1089`	`1086`	`}`
`1090`	`1087`	`}`
`1091`		`-`
	`1088`	`+`
`1092`	`1089`	`if (empty($objKey->key)) {`
`1093`	`1090`	`$objKey->loadKey($key);`
`1094`	`1091`	`}`