@@ -27,7 +27,6 @@ |
||
27 | 27 | use NFePHP\Common\Certificate; |
28 | 28 | use NFePHP\Common\Certificate\PublicKey; |
29 | 29 | use NFePHP\Common\Exception\SignerException; |
30 | -use NFePHP\Common\Strings; |
|
31 | 30 | use NFePHP\Common\Validator; |
32 | 31 | use DOMDocument; |
33 | 32 | use DOMNode; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | class Signer |
37 | 37 | { |
38 | - private static $canonical = [true,false,null,null]; |
|
38 | + private static $canonical = [true, false, null, null]; |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * Make Signature tag |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $tagname, |
56 | 56 | $mark = 'Id', |
57 | 57 | $algorithm = OPENSSL_ALGO_SHA1, |
58 | - $canonical = [true,false,null,null], |
|
58 | + $canonical = [true, false, null, null], |
|
59 | 59 | $rootname = '' |
60 | 60 | ) { |
61 | 61 | if (!empty($canonical)) { |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | if (empty($content)) { |
65 | 65 | throw SignerException::isNotXml(); |
66 | 66 | } |
67 | - if (! Validator::isXML($content)) { |
|
67 | + if (!Validator::isXML($content)) { |
|
68 | 68 | throw SignerException::isNotXml(); |
69 | 69 | } |
70 | 70 | $dom = new DOMDocument('1.0', 'UTF-8'); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | if (empty($node) || empty($root)) { |
80 | 80 | throw SignerException::tagNotFound($tagname); |
81 | 81 | } |
82 | - if (! self::existsSignature($content)) { |
|
82 | + if (!self::existsSignature($content)) { |
|
83 | 83 | $dom = self::createSignature( |
84 | 84 | $certificate, |
85 | 85 | $dom, |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | DOMElement $node, |
113 | 113 | $mark, |
114 | 114 | $algorithm = OPENSSL_ALGO_SHA1, |
115 | - $canonical = [true,false,null,null] |
|
115 | + $canonical = [true, false, null, null] |
|
116 | 116 | ) { |
117 | 117 | $nsDSIG = 'http://www.w3.org/2000/09/xmldsig#'; |
118 | 118 | $nsCannonMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315'; |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | $nsSignatureMethod = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'; |
125 | 125 | $nsDigestMethod = 'http://www.w3.org/2001/04/xmlenc#sha256'; |
126 | 126 | } |
127 | - $nsTransformMethod1 ='http://www.w3.org/2000/09/xmldsig#enveloped-signature'; |
|
127 | + $nsTransformMethod1 = 'http://www.w3.org/2000/09/xmldsig#enveloped-signature'; |
|
128 | 128 | $nsTransformMethod2 = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315'; |
129 | 129 | $idSigned = trim($node->getAttribute($mark)); |
130 | 130 | $digestValue = self::makeDigest($node, $digestAlgorithm, $canonical); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | public static function removeSignature($content) |
181 | 181 | { |
182 | - if (! self::existsSignature($content)) { |
|
182 | + if (!self::existsSignature($content)) { |
|
183 | 183 | return $content; |
184 | 184 | } |
185 | 185 | $dom = new \DOMDocument('1.0', 'utf-8'); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | public static function isSigned( |
208 | 208 | $content, |
209 | 209 | $tagname = '', |
210 | - $canonical = [true,false,null,null] |
|
210 | + $canonical = [true, false, null, null] |
|
211 | 211 | ) { |
212 | 212 | if (self::existsSignature($content)) { |
213 | 213 | if (self::digestCheck($content, $tagname, $canonical)) { |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | */ |
227 | 227 | public static function existsSignature($content) |
228 | 228 | { |
229 | - if (! Validator::isXML($content)) { |
|
229 | + if (!Validator::isXML($content)) { |
|
230 | 230 | throw SignerException::isNotXml(); |
231 | 231 | } |
232 | 232 | $dom = new \DOMDocument('1.0', 'utf-8'); |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | */ |
249 | 249 | private static function signatureCheck( |
250 | 250 | $xml, |
251 | - $canonical = [true,false,null,null] |
|
251 | + $canonical = [true, false, null, null] |
|
252 | 252 | ) { |
253 | 253 | $dom = new \DOMDocument('1.0', 'utf-8'); |
254 | 254 | $dom->formatOutput = false; |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | $decodedSignature = base64_decode( |
275 | 275 | str_replace(array("\r", "\n"), '', $signatureValue) |
276 | 276 | ); |
277 | - if (! $publicKey->verify($signInfoNode, $decodedSignature, $algorithm)) { |
|
277 | + if (!$publicKey->verify($signInfoNode, $decodedSignature, $algorithm)) { |
|
278 | 278 | throw SignerException::signatureComparisonFailed(); |
279 | 279 | } |
280 | 280 | return true; |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | private static function digestCheck( |
291 | 291 | $xml, |
292 | 292 | $tagname = '', |
293 | - $canonical = [true,false,null,null] |
|
293 | + $canonical = [true, false, null, null] |
|
294 | 294 | ) { |
295 | 295 | $dom = new \DOMDocument('1.0', 'utf-8'); |
296 | 296 | $dom->formatOutput = false; |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | private static function makeDigest( |
347 | 347 | DOMNode $node, |
348 | 348 | $algorithm, |
349 | - $canonical = [true,false,null,null] |
|
349 | + $canonical = [true, false, null, null] |
|
350 | 350 | ) { |
351 | 351 | //calcular o hash dos dados |
352 | 352 | $c14n = self::canonize($node, $canonical); |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | */ |
363 | 363 | private static function canonize( |
364 | 364 | DOMNode $node, |
365 | - $canonical = [true,false,null,null] |
|
365 | + $canonical = [true, false, null, null] |
|
366 | 366 | ) { |
367 | 367 | return $node->C14N( |
368 | 368 | $canonical[0], |