@@ -39,7 +39,7 @@ |
||
39 | 39 | $dom->formatOutput = false; |
40 | 40 | $dom->loadXML($xml, LIBXML_NOBLANKS | LIBXML_NOEMPTYTAG); |
41 | 41 | libxml_clear_errors(); |
42 | - if (! $dom->schemaValidate($xsd)) { |
|
42 | + if (!$dom->schemaValidate($xsd)) { |
|
43 | 43 | $errors = []; |
44 | 44 | foreach (libxml_get_errors() as $error) { |
45 | 45 | $errors[] = $error->message; |
@@ -23,10 +23,10 @@ discard block |
||
23 | 23 | public static function replaceSpecialsChars($string) |
24 | 24 | { |
25 | 25 | $string = trim($string); |
26 | - $aFind = ['&','á','à','ã','â','é','ê','í','ó','ô','õ','ú','ü', |
|
27 | - 'ç','Á','À','Ã','Â','É','Ê','Í','Ó','Ô','Õ','Ú','Ü','Ç']; |
|
28 | - $aSubs = ['e','a','a','a','a','e','e','i','o','o','o','u','u', |
|
29 | - 'c','A','A','A','A','E','E','I','O','O','O','U','U','C']; |
|
26 | + $aFind = ['&', 'á', 'à', 'ã', 'â', 'é', 'ê', 'í', 'ó', 'ô', 'õ', 'ú', 'ü', |
|
27 | + 'ç', 'Á', 'À', 'Ã', 'Â', 'É', 'Ê', 'Í', 'Ó', 'Ô', 'Õ', 'Ú', 'Ü', 'Ç']; |
|
28 | + $aSubs = ['e', 'a', 'a', 'a', 'a', 'e', 'e', 'i', 'o', 'o', 'o', 'u', 'u', |
|
29 | + 'c', 'A', 'A', 'A', 'A', 'E', 'E', 'I', 'O', 'O', 'O', 'U', 'U', 'C']; |
|
30 | 30 | $newstr = str_replace($aFind, $aSubs, $string); |
31 | 31 | $newstr = preg_replace("/[^a-zA-Z0-9 @,-_.;:\/]/", "", $newstr); |
32 | 32 | return $newstr; |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | public static function clearProtocoledXML($string) |
95 | 95 | { |
96 | 96 | $procXML = self::clearXmlString($string); |
97 | - $aApp = array('nfe','cte','mdfe'); |
|
97 | + $aApp = array('nfe', 'cte', 'mdfe'); |
|
98 | 98 | foreach ($aApp as $app) { |
99 | 99 | $procXML = str_replace( |
100 | - 'xmlns="http://www.portalfiscal.inf.br/'.$app.'" xmlns="http://www.w3.org/2000/09/xmldsig#"', |
|
101 | - 'xmlns="http://www.portalfiscal.inf.br/'.$app.'"', |
|
100 | + 'xmlns="http://www.portalfiscal.inf.br/' . $app . '" xmlns="http://www.w3.org/2000/09/xmldsig#"', |
|
101 | + 'xmlns="http://www.portalfiscal.inf.br/' . $app . '"', |
|
102 | 102 | $procXML |
103 | 103 | ); |
104 | 104 | } |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | public static function removeSomeAlienCharsfromTxt($txt) |
114 | 114 | { |
115 | 115 | //remove CRs and TABs |
116 | - $txt = str_replace(["\r","\t"], "", $txt); |
|
116 | + $txt = str_replace(["\r", "\t"], "", $txt); |
|
117 | 117 | //remove multiple spaces |
118 | 118 | $txt = preg_replace('/(?:\s\s+)/', ' ', $txt); |
119 | 119 | //remove spaces at begin and end of fields |
120 | - $txt = str_replace(["| "," |"], "|", $txt); |
|
120 | + $txt = str_replace(["| ", " |"], "|", $txt); |
|
121 | 121 | return $txt; |
122 | 122 | } |
123 | 123 |
@@ -358,7 +358,7 @@ |
||
358 | 358 | * Mount soap envelope |
359 | 359 | * @param string $request |
360 | 360 | * @param array $namespaces |
361 | - * @param $soapVer int |
|
361 | + * @param integer $soapVer int |
|
362 | 362 | * @param \SOAPHeader $header |
363 | 363 | * @return string |
364 | 364 | */ |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | $bodyContent = '' |
393 | 393 | ) { |
394 | 394 | return sprintf( |
395 | - '<%s:Envelope %s >'.$header.'<%s:Body>%s</%s:Body></%s:Envelop>', |
|
395 | + '<%s:Envelope %s >' . $header . '<%s:Body>%s</%s:Body></%s:Envelop>', |
|
396 | 396 | $envelopPrefix, |
397 | 397 | $envelopAttributes, |
398 | 398 | $envelopPrefix, |
@@ -415,7 +415,7 @@ discard block |
||
415 | 415 | |
416 | 416 | $headerItems = ''; |
417 | 417 | foreach ($header->data as $key => $value) { |
418 | - $headerItems = '<'.$key.'>'.$value.'<'.$key.'>'; |
|
418 | + $headerItems = '<' . $key . '>' . $value . '<' . $key . '>'; |
|
419 | 419 | } |
420 | 420 | |
421 | 421 | return sprintf( |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | { |
436 | 436 | $envelopeAttributes = ''; |
437 | 437 | foreach ($namespaces as $key => $value) { |
438 | - $envelopeAttributes = $key.'="'.$value.'"'; |
|
438 | + $envelopeAttributes = $key . '="' . $value . '"'; |
|
439 | 439 | } |
440 | 440 | |
441 | 441 | return $envelopeAttributes; |
@@ -453,9 +453,9 @@ discard block |
||
453 | 453 | ); |
454 | 454 | } |
455 | 455 | $this->certsdir = $this->certificate->getCnpj() . '/certs/'; |
456 | - $this->prifile = $this->certsdir. Strings::randomString(10).'.pem'; |
|
457 | - $this->pubfile = $this->certsdir . Strings::randomString(10).'.pem'; |
|
458 | - $this->certfile = $this->certsdir . Strings::randomString(10).'.pem'; |
|
456 | + $this->prifile = $this->certsdir . Strings::randomString(10) . '.pem'; |
|
457 | + $this->pubfile = $this->certsdir . Strings::randomString(10) . '.pem'; |
|
458 | + $this->certfile = $this->certsdir . Strings::randomString(10) . '.pem'; |
|
459 | 459 | $ret = true; |
460 | 460 | $private = $this->certificate->privateKey; |
461 | 461 | if ($this->encriptPrivateKey) { |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | ); |
481 | 481 | $ret &= $this->filesystem->put( |
482 | 482 | $this->certfile, |
483 | - $private."{$this->certificate}" |
|
483 | + $private . "{$this->certificate}" |
|
484 | 484 | ); |
485 | 485 | if (!$ret) { |
486 | 486 | throw new RuntimeException( |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | //utilize a API. Outra solução para remover arquivos "perdidos" pode ser |
507 | 507 | //encontrada oportunamente. |
508 | 508 | $dt = new \DateTime(); |
509 | - $tint = new \DateInterval("PT".$this->waitingTime."M"); |
|
509 | + $tint = new \DateInterval("PT" . $this->waitingTime . "M"); |
|
510 | 510 | $tint->invert = true; |
511 | 511 | $tsLimit = $dt->add($tint)->getTimestamp(); |
512 | 512 | foreach ($contents as $item) { |
@@ -10,6 +10,6 @@ |
||
10 | 10 | public function __construct(Certificate $certificate) |
11 | 11 | { |
12 | 12 | $invalidDate = $certificate->getValidFrom()->format('Y-m-d H:i'); |
13 | - parent::__construct('Certificate invalid from '.$invalidDate, 0, null); |
|
13 | + parent::__construct('Certificate invalid from ' . $invalidDate, 0, null); |
|
14 | 14 | } |
15 | 15 | } |
@@ -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], |