Version 1.0.3

Author: eclipxe13

.travis.yml

@@ -4,11 +4,6 @@ language: php
 php:
   - 7.0
   - 7.1
-  - nightly
-
-matrix:
-  allow_failures:
-    - php: nightly
 
 # This triggers builds to run on the new TravisCI infrastructure.
 # See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/

docs/CHANGELOG.md

@@ -1,2 +1,21 @@
+# Version 1.0.3 2017-10-09
+- Fix a bug to read the RFC when a certificate does not contain the pattern RFC / CURP but only RFC in the
+  subject x500UniqueIdentifier field 
+
+
+# Version 1.0.2 2017-09-28 - Thanks phpstan!
+- After using `phpstan/phpstan` change the execution plan on `CadenaOrigen`.
+  The function previous function `throwLibXmlErrorOrMessage(string $message)` always
+  throw an exception but it was not clear in the flow of `build` method.
+  Now it returns a \RuntimeException and that is thrown. So it is easy for an analysis tool
+  to know that the flow has been stopped. 
+- Also fix case of calls `XSLTProcessor::importStylesheet` and `XSLTProcessor::transformToXml`
+- Check with `isset` that `LibXMLError::$message` exists, phpstan was failing for this.
+
+
+# Version 1.0.1 2017-09-27
+- Remove Travis CI PHP nightly builds, it fail with require-dev dependencies.
+
+
 # Version 1.0.0 2017-09-27
 - Initial release

src/CfdiUtils/CadenaOrigen.php

@@ -47,7 +47,7 @@ public function build(string $cfdiContent, string $xsltLocation = ''): string
             // load the cfdi document
             $cfdi = new DOMDocument();
             if (! $cfdi->loadXML($cfdiContent)) {
-                $this->throwLibXmlErrorOrMessage('Error while loading the cfdi content');
+                throw $this->createLibXmlErrorOrMessage('Error while loading the cfdi content');
             }
 
             // if not set, obtain default location from document version
@@ -61,18 +61,18 @@ public function build(string $cfdiContent, string $xsltLocation = ''): string
 
             $xsl = new DOMDocument();
             if (! $xsl->load($xsltLocation)) {
-                $this->throwLibXmlErrorOrMessage('Error while loading the Xslt location');
+                throw $this->createLibXmlErrorOrMessage('Error while loading the Xslt location');
             }
 
             $xslt = new XSLTProcessor();
-            if (! $xslt->importStyleSheet($xsl)) {
-                $this->throwLibXmlErrorOrMessage('Error while importing the style sheet from the Xslt location');
+            if (! $xslt->importStylesheet($xsl)) {
+                throw $this->createLibXmlErrorOrMessage('Error while importing the style sheet from the Xslt location');
             }
 
             // this error silenced call is intentional, avoid transformation errors except when return false
-            $transform = @$xslt->transformToXML($cfdi);
+            $transform = @$xslt->transformToXml($cfdi);
             if (false === $transform || null === $transform) {
-                $this->throwLibXmlErrorOrMessage('Error while transforming the xslt content');
+                throw $this->createLibXmlErrorOrMessage('Error while transforming the xslt content');
             }
 
             return $transform;
@@ -82,12 +82,12 @@ public function build(string $cfdiContent, string $xsltLocation = ''): string
         }
     }
 
-    private function throwLibXmlErrorOrMessage(string $message)
+    private function createLibXmlErrorOrMessage(string $message): \Exception
     {
         $error = libxml_get_last_error();
-        if ($error instanceof LibXMLError) {
+        if (($error instanceof LibXMLError) && isset($error->message)) {
             $message = $message . ': ' . $error->message;
         }
-        throw new \RuntimeException($message);
+        return new \RuntimeException($message);
     }
 }

src/CfdiUtils/Certificado.php

@@ -52,7 +52,7 @@ public function __construct(string $filename)
         }
 
         // set all the values
-        $this->rfc = strstr($data['subject']['x500UniqueIdentifier'], ' ', true);
+        $this->rfc = strstr($data['subject']['x500UniqueIdentifier'] . ' ', ' ', true);
         $this->name = $data['subject']['name'];
         $this->serial = $this->serialHexToAscii($data['serialNumberHex']);
         $this->validFrom = $data['validFrom_time_t'];

tests/CfdiUtilsTests/CertificadoTest.php

@@ -154,4 +154,11 @@ public function testBelongsToWithEmptyFile()
 
         $certificate->belongsTo($pemKeyFile);
     }
+
+    public function testCanReadRfcFromCertificateWhenX500UniqueIdentifierOnlyContainsRfcAndNoCurp()
+    {
+        $certificateFile = $this->utilAsset('certs/00001000000301246267.cer');
+        $certificate = new Certificado($certificateFile);
+        $this->assertEquals('SOMG790807J57', $certificate->getRfc());
+    }
 }

tests/assets/certs/00001000000301246267.cer

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEYTCCA0mgAwIBAgIUMDAwMDEwMDAwMDAzMDEyNDYyNjcwDQYJKoZIhvcNAQEF
+BQAwggGKMTgwNgYDVQQDDC9BLkMuIGRlbCBTZXJ2aWNpbyBkZSBBZG1pbmlzdHJh
+Y2nDs24gVHJpYnV0YXJpYTEvMC0GA1UECgwmU2VydmljaW8gZGUgQWRtaW5pc3Ry
+YWNpw7NuIFRyaWJ1dGFyaWExODA2BgNVBAsML0FkbWluaXN0cmFjacOzbiBkZSBT
+ZWd1cmlkYWQgZGUgbGEgSW5mb3JtYWNpw7NuMR8wHQYJKoZIhvcNAQkBFhBhY29k
+c0BzYXQuZ29iLm14MSYwJAYDVQQJDB1Bdi4gSGlkYWxnbyA3NywgQ29sLiBHdWVy
+cmVybzEOMAwGA1UEEQwFMDYzMDAxCzAJBgNVBAYTAk1YMRkwFwYDVQQIDBBEaXN0
+cml0byBGZWRlcmFsMRQwEgYDVQQHDAtDdWF1aHTDqW1vYzEVMBMGA1UELRMMU0FU
+OTcwNzAxTk4zMTUwMwYJKoZIhvcNAQkCDCZSZXNwb25zYWJsZTogQ2xhdWRpYSBD
+b3ZhcnJ1YmlhcyBPY2hvYTAeFw0xMzExMDcxNTQ1MDFaFw0xNzExMDcxNTQ1MDFa
+MIGtMRwwGgYDVQQDFBNHSU9WQU5JIFNPTElTIE1V0U9aMRwwGgYDVQQpFBNHSU9W
+QU5JIFNPTElTIE1V0U9aMRwwGgYDVQQKFBNHSU9WQU5JIFNPTElTIE1V0U9aMRYw
+FAYDVQQtEw1TT01HNzkwODA3SjU3MRswGQYDVQQFExJTT01HNzkwODA3SEFTTFhW
+MDgxHDAaBgNVBAsUE0dJT1ZBTkkgU09MSVMgTVXRT1owgZ8wDQYJKoZIhvcNAQEB
+BQADgY0AMIGJAoGBAIEiGWQqIgcnYCdcMO18xZUBwz79b9KRX4nNCvbQ8qI42cpe
+P0HGtaCJ0tAOjJ/rZVVImp1J6cuGgKtl0KT+qfrd3l7S1lBChop+qjQ7l/DZXpUJ
+yeU4oWF7MiV//a9oZqTcNnTOij9rjOutTii/uqN9QwhIIK6/2Fp6lt4m4skTAgMB
+AAGjHTAbMAwGA1UdEwEB/wQCMAAwCwYDVR0PBAQDAgbAMA0GCSqGSIb3DQEBBQUA
+A4IBAQAiJSWBzeQAPjwPAmK6r1FE1FbPvf4xS9rlnbvbUC/wK2PKkTWtHpoPsqpe
+EysJFnJiMOr4fI/dMnajXIqEqc3FWPoWo4e3bsAf0CVj5DyMGOdyySlUq4jVFRmp
+lJPNiTMUlPxtvECoOUbO0WqLIqt4BEG7BzejLkOcZMHcKnoinjZv8YNE03hJz+VU
+FYwefAWj1/+bKemo9qgvFTKmz/TdHP08gvOXWvw9m3FmOZjiPN4IscvZbd/cDwBP
+9yhQNWWJkNVsF5+PKZUDrqpgFDbb7CN5nM9FDYwyf5zYavxYmycPO3ijaAZGqeKD
+XH2vnCJNk9OMwvDqRrZZczUOZn6y
+-----END CERTIFICATE-----