Merge branch 'refs/heads/main' into fix-cerificate-json

Author: sevaske

README.md

@@ -321,7 +321,7 @@ $certificate = $json_data['certificate'];
 $secret = $json_data['secret'];
 
 // Load the private key
-$privateKey = (new Storage)->put(__DIR__ . '/output/private.pem');
+$privateKey = (new Storage)->get(__DIR__ . '/output/private.pem');
 $cleanPrivateKey = trim(str_replace(["-----BEGIN PRIVATE KEY-----", "-----END PRIVATE KEY-----"], "", $privateKey));
 
 // Create a Certificate instance
@@ -332,10 +332,9 @@ $certificate = new Certificate(
 );
 
 // Sign the invoice
-$signedInvoice = InvoiceSigner::signInvoice($xmlInvoice, $certificate);
-
+$signedInvoice = InvoiceSigner::signInvoice($xmlInvoice, $certificate)->getXML();
 // Save the signed invoice
-InvoiceSigner::signInvoice($xmlInvoice, $certificate)->saveXMLFile('/output/signed_invoice.xml');
+(new Storage)->put(__DIR__.'/output/signed_invoice.xml', $signedInvoice);
 ```
 
 ### 📤 **5. Submitting the Signed Invoice to ZATCA**  

examples/SigningInvoices.php

@@ -22,11 +22,11 @@
 // get private key
 $privateKey = file_get_contents(__DIR__ .'/output/private.pem');
 
-$claenPrivateKey = trim(str_replace(["-----BEGIN PRIVATE KEY-----", "-----END PRIVATE KEY-----"], "", $privateKey));
+$cleanPrivateKey = trim(str_replace(["-----BEGIN PRIVATE KEY-----", "-----END PRIVATE KEY-----"], "", $privateKey));
 
 $certificate = (new Certificate(
     $certificate,
-    $claenPrivateKey,
+    $cleanPrivateKey,
     $secret 
 )); 
 

src/CertificateBuilder.php

@@ -8,10 +8,11 @@
  *
  * Builds a CSR and private key using OpenSSL.
  * The CSR is saved as a file (default "certificate.csr") and the key as a file (default "private.pem").
+ * @see https://zatca.gov.sa/en/E-Invoicing/Introduction/Guidelines/Documents/Fatoora_Portal_User_Manual_English.pdf page 31 ..
  */
 class CertificateBuilder {
     private const OID_PROD = 'ZATCA-Code-Signing';
-    private const OID_TEST = 'TSTZATCA-Code-Signing';
+    private const OID_TEST = 'PREZATCA-Code-Signing';
     private const CONFIG_TEMPLATE = <<<EOL
 [req]
 prompt = no
@@ -21,7 +22,7 @@ class CertificateBuilder {
 [req_dn]
 
 [v3_req]
-1.3.6.1.4.1.311.20.2 = ASN1:UTF8String:%s
+1.3.6.1.4.1.311.20.2 = ASN1:PRINTABLESTRING:%s
 subjectAltName = dirName:dir_sect
 
 [dir_sect]

src/Storage.php

@@ -147,18 +147,21 @@ protected function ensureDirectoryExists(string $path): void
         }
 
         // If directory exists but is not writable, throw exception
-        if (is_dir($path) && !is_writable($path)) {
-            throw new ZatcaStorageException('Directory exists but is not writable.', ['path' => $path]);
+        if (is_dir($path)) {
+            if (!is_writable($path)) {
+                throw new ZatcaStorageException('Directory exists but is not writable.', ['path' => $path]);
+            }
+            return;
         }
 
-        // If parent directory is not writable, fail before mkdir()
+        // Ensure the parent directory exists before creating the target directory
         $parentDir = dirname($path);
-        if (!is_writable($parentDir)) {
-            throw new ZatcaStorageException('Parent directory is not writable.', ['path' => $parentDir]);
+        if (!is_dir($parentDir)) {
+            $this->ensureDirectoryExists($parentDir); // Recursively create parent directories
         }
 
         // If directory does not exist, attempt to create it
-        if (!is_dir($path) && !mkdir($path, 0777, true) && !is_dir($path)) {
+        if (!is_dir($path) && !mkdir($path, 0755, true) && !is_dir($path)) {
             throw new ZatcaStorageException('Failed to create directory.', ['path' => $path]);
         }
     }

src/ZatcaAPI.php

@@ -313,7 +313,7 @@ private function parseResponse(ResponseInterface $response): array
     private function formatCertificate(string $base64Certificate): string
     {
         $decoded = base64_decode($base64Certificate);
-        return "-----BEGIN CERTIFICATE-----\n{$decoded}\n-----END CERTIFICATE-----";
+        return $decoded;
     }
 
     /**