Completed
Pull Request — master (#60)
by Daan van
18:54 queued 55s
created
src/SAML2/LogoutRequest.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
     /**
108 108
      * Check whether the NameId is encrypted.
109 109
      *
110
-     * @return true if the NameId is encrypted, false if not.
110
+     * @return boolean if the NameId is encrypted, false if not.
111 111
      */
112 112
     public function isNameIdEncrypted()
113 113
     {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -264,7 +264,7 @@
 block discarded – undo
264 264
         if ($this->encryptedNameId === null) {
265 265
             Utils::addNameId($root, $this->nameId);
266 266
         } else {
267
-            $eid = $root->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:' . 'EncryptedID');
267
+            $eid = $root->ownerDocument->createElementNS(Constants::NS_SAML, 'saml:'.'EncryptedID');
268 268
             $root->appendChild($eid);
269 269
             $eid->appendChild($root->ownerDocument->importNode($this->encryptedNameId, true));
270 270
         }
Please login to merge, or discard this patch.
src/SAML2/Response.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
     /**
46 46
      * Retrieve the assertions in this response.
47 47
      *
48
-     * @return \SAML2\Assertion[]|\SAML2\EncryptedAssertion[]
48
+     * @return Utilities\ArrayCollection
49 49
      */
50 50
     public function getAssertions()
51 51
     {
Please login to merge, or discard this patch.
src/SAML2/Response/Processor.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
      * @param \SAML2\Configuration\Destination      $currentDestination
65 65
      * @param \SAML2\Response                       $response
66 66
      *
67
-     * @return \SAML2\Assertion[] Collection (\SAML2\Utilities\ArrayCollection) of \SAML2\Assertion objects
67
+     * @return \SAML2\Utilities\ArrayCollection Collection (\SAML2\Utilities\ArrayCollection) of \SAML2\Assertion objects
68 68
      */
69 69
     public function process(
70 70
         ServiceProvider $serviceProviderConfiguration,
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
     /**
135 135
      * @param \SAML2\Response $response
136 136
      *
137
-     * @return \SAML2\Assertion[]
137
+     * @return \SAML2\Utilities\ArrayCollection
138 138
      */
139 139
     private function processAssertions(Response $response)
140 140
     {
Please login to merge, or discard this patch.
src/SAML2/SOAPClient.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -212,6 +212,10 @@
 block discarded – undo
212 212
      * @param $soapmessage Soap response needs to be type DOMDocument
213 213
      * @return $soapfaultstring string|null
214 214
      */
215
+
216
+    /**
217
+     * @param \DOMDocument $soapMessage
218
+     */
215 219
     private function getSOAPFault($soapMessage)
216 220
     {
217 221
         $soapFault = Utils::xpQuery($soapMessage->firstChild, '/soap-env:Envelope/soap-env:Body/soap-env:Fault');
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
             $privateKey = SimpleSAML_Utilities::loadPrivateKey($srcMetadata);
52 52
             $publicKey = SimpleSAML_Utilities::loadPublicKey($srcMetadata);
53 53
             if ($privateKey !== null && $publicKey !== null && isset($publicKey['PEM'])) {
54
-                $keyCertData = $privateKey['PEM'] . $publicKey['PEM'];
55
-                $file = SimpleSAML_Utilities::getTempDir() . '/' . sha1($keyCertData) . '.pem';
54
+                $keyCertData = $privateKey['PEM'].$publicKey['PEM'];
55
+                $file = SimpleSAML_Utilities::getTempDir().'/'.sha1($keyCertData).'.pem';
56 56
                 if (!file_exists($file)) {
57 57
                     SimpleSAML_Utilities::writeFile($file, $keyCertData);
58 58
                 }
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
                 if ($key['type'] !== 'X509Certificate') {
72 72
                     continue;
73 73
                 }
74
-                $certData .= "-----BEGIN CERTIFICATE-----\n" .
75
-                    chunk_split($key['X509Certificate'], 64) .
74
+                $certData .= "-----BEGIN CERTIFICATE-----\n".
75
+                    chunk_split($key['X509Certificate'], 64).
76 76
                     "-----END CERTIFICATE-----\n";
77 77
             }
78
-            $peerCertFile = SimpleSAML_Utilities::getTempDir() . '/' . sha1($certData) . '.pem';
78
+            $peerCertFile = SimpleSAML_Utilities::getTempDir().'/'.sha1($certData).'.pem';
79 79
             if (!file_exists($peerCertFile)) {
80 80
                 SimpleSAML_Utilities::writeFile($peerCertFile, $certData);
81 81
             }
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
         // Add soap-envelopes
102 102
         $request = $msg->toSignedXML();
103
-        $request = self::START_SOAP_ENVELOPE . $request->ownerDocument->saveXML($request) . self::END_SOAP_ENVELOPE;
103
+        $request = self::START_SOAP_ENVELOPE.$request->ownerDocument->saveXML($request).self::END_SOAP_ENVELOPE;
104 104
 
105 105
         Utils::getContainer()->debugMessage($request, 'out');
106 106
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         // There is a fault element but we haven't found out what the fault string is
226 226
         $soapFaultString = "Unknown fault string found";
227 227
         // find out the fault string
228
-        $faultStringElement =   Utils::xpQuery($soapFaultElement, './soap-env:faultstring') ;
228
+        $faultStringElement = Utils::xpQuery($soapFaultElement, './soap-env:faultstring');
229 229
         if (!empty($faultStringElement)) {
230 230
             return $faultStringElement[0]->textContent;
231 231
         }
Please login to merge, or discard this patch.
src/SAML2/Binding.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
             case Constants::BINDING_HOK_SSO:
40 40
                 return new HTTPPost();
41 41
             default:
42
-                throw new \Exception('Unsupported binding: ' . var_export($urn, true));
42
+                throw new \Exception('Unsupported binding: '.var_export($urn, true));
43 43
         }
44 44
     }
45 45
 
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
 
86 86
         $logger = Utils::getContainer()->getLogger();
87 87
         $logger->warning('Unable to find the SAML 2 binding used for this request.');
88
-        $logger->warning('Request method: ' . var_export($_SERVER['REQUEST_METHOD'], true));
88
+        $logger->warning('Request method: '.var_export($_SERVER['REQUEST_METHOD'], true));
89 89
         if (!empty($_GET)) {
90
-            $logger->warning("GET parameters: '" . implode("', '", array_map('addslashes', array_keys($_GET))) . "'");
90
+            $logger->warning("GET parameters: '".implode("', '", array_map('addslashes', array_keys($_GET)))."'");
91 91
         }
92 92
         if (!empty($_POST)) {
93
-            $logger->warning("POST parameters: '" . implode("', '", array_map('addslashes', array_keys($_POST))) . "'");
93
+            $logger->warning("POST parameters: '".implode("', '", array_map('addslashes', array_keys($_POST)))."'");
94 94
         }
95 95
         if (isset($_SERVER['CONTENT_TYPE'])) {
96
-            $logger->warning('Content-Type: ' . var_export($_SERVER['CONTENT_TYPE'], true));
96
+            $logger->warning('Content-Type: '.var_export($_SERVER['CONTENT_TYPE'], true));
97 97
         }
98 98
 
99 99
         throw new \Exception('Unable to find the current binding.');
Please login to merge, or discard this patch.
src/SAML2/Compat/Ssp/Logger.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
      */
14 14
     public function emergency($message, array $context = array())
15 15
     {
16
-        SimpleSAML_Logger::emergency($message . var_export($context, true));
16
+        SimpleSAML_Logger::emergency($message.var_export($context, true));
17 17
     }
18 18
 
19 19
     /**
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
      */
29 29
     public function alert($message, array $context = array())
30 30
     {
31
-        SimpleSAML_Logger::alert($message . var_export($context, true));
31
+        SimpleSAML_Logger::alert($message.var_export($context, true));
32 32
     }
33 33
 
34 34
     /**
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
      */
43 43
     public function critical($message, array $context = array())
44 44
     {
45
-        SimpleSAML_Logger::critical($message . var_export($context, true));
45
+        SimpleSAML_Logger::critical($message.var_export($context, true));
46 46
     }
47 47
 
48 48
     /**
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
      */
56 56
     public function error($message, array $context = array())
57 57
     {
58
-        SimpleSAML_Logger::error($message . var_export($context, true));
58
+        SimpleSAML_Logger::error($message.var_export($context, true));
59 59
     }
60 60
 
61 61
     /**
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
      */
71 71
     public function warning($message, array $context = array())
72 72
     {
73
-        SimpleSAML_Logger::warning($message . var_export($context, true));
73
+        SimpleSAML_Logger::warning($message.var_export($context, true));
74 74
     }
75 75
 
76 76
     /**
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
      */
83 83
     public function notice($message, array $context = array())
84 84
     {
85
-        SimpleSAML_Logger::notice($message . var_export($context, true));
85
+        SimpleSAML_Logger::notice($message.var_export($context, true));
86 86
     }
87 87
 
88 88
     /**
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
      */
97 97
     public function info($message, array $context = array())
98 98
     {
99
-        SimpleSAML_Logger::info($message . var_export($context, true));
99
+        SimpleSAML_Logger::info($message.var_export($context, true));
100 100
     }
101 101
 
102 102
     /**
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
      */
109 109
     public function debug($message, array $context = array())
110 110
     {
111
-        SimpleSAML_Logger::debug($message . var_export($context, true));
111
+        SimpleSAML_Logger::debug($message.var_export($context, true));
112 112
     }
113 113
 
114 114
     /**
Please login to merge, or discard this patch.
src/SAML2/Configuration/IdentityProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
     public function getPrivateKey($name, $required = false)
49 49
     {
50 50
         $privateKeys = $this->get('privateKeys');
51
-        $key = array_filter($privateKeys, function (PrivateKey $key) use ($name) {
51
+        $key = array_filter($privateKeys, function(PrivateKey $key) use ($name) {
52 52
             return $key->getName() === $name;
53 53
         });
54 54
 
Please login to merge, or discard this patch.
src/SAML2/Configuration/ServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
     public function getPrivateKey($name, $required = false)
51 51
     {
52 52
         $privateKeys = $this->get('privateKeys');
53
-        $key         = array_filter($privateKeys, function (PrivateKey $key) use ($name) {
53
+        $key         = array_filter($privateKeys, function(PrivateKey $key) use ($name) {
54 54
             return $key->getName() === $name;
55 55
         });
56 56
 
Please login to merge, or discard this patch.
src/SAML2/Constants.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@
 block discarded – undo
53 53
     const CM_BEARER = 'urn:oasis:names:tc:SAML:2.0:cm:bearer';
54 54
 
55 55
     /**
56
-    * Holder-of-Key subject confirmation method.
57
-    */
56
+     * Holder-of-Key subject confirmation method.
57
+     */
58 58
     const CM_HOK = 'urn:oasis:names:tc:SAML:2.0:cm:holder-of-key';
59 59
     
60 60
     /**
Please login to merge, or discard this patch.