Fix localizations

chiiya · Feb 20, 2025 · 8654699 · 8654699
1 parent 66c1c42
commit 8654699
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/.env.example b/.env.example
@@ -1,3 +1,5 @@
 PASSES_APPLE_CERT="tests/certs/certificate.p12"
 PASSES_APPLE_WWDR="tests/certs/wwdr.pem"
 PASSES_APPLE_PASSWORD=
+PASSES_APPLE_TEAM_ID=
+PASSES_APPLE_IDENTIFIER=
diff --git a/src/Apple/PassFactory.php b/src/Apple/PassFactory.php
@@ -356,7 +356,7 @@ protected function createLocalizations(Pass $pass, string $dir): void
             file_put_contents($localizationDir.'/'.self::STRINGS_FILENAME, $strings);
 
             foreach ($localization->images as $image) {
-                $filename = $localizationDir.'/'.($image->getName() ?? $image->getFilename());
+                $filename = $localizationDir.'/'.$this->getImageName($image).'.'.$image->getExtension();
                 copy($image->getPathname(), $filename);
             }
         }
@@ -368,7 +368,7 @@ protected function createLocalizations(Pass $pass, string $dir): void
     protected function createManifest(string $dir): void
     {
         $manifest = [];
-        $files = new FilesystemIterator($dir);
+        $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir));
 
         /** @var SplFileInfo $file */
         foreach ($files as $file) {
@@ -451,13 +451,13 @@ protected function openssl_pkcs12_read_wrapper(string $pkcs12, string $passphras
         // Try an alternative route using shell_exec to allow legacy support
         // Try the shell_exec method with and without the -legacy flag
         $commands = [
-            'openssl pkcs12 -in '.escapeshellarg($this->certificate)
-            .' -passin '.escapeshellarg('pass:'.$passphrase)
-            .' -passout '.escapeshellarg('pass:'.$passphrase),
             'openssl pkcs12 -in '.escapeshellarg($this->certificate)
             .' -passin '.escapeshellarg('pass:'.$passphrase)
             .' -passout '.escapeshellarg('pass:'.$passphrase)
             .' -legacy',
+            'openssl pkcs12 -in '.escapeshellarg($this->certificate)
+            .' -passin '.escapeshellarg('pass:'.$passphrase)
+            .' -passout '.escapeshellarg('pass:'.$passphrase),
         ];
 
         foreach ($commands as $command) {

diff --git a/tests/Apple/PassFactoryTest.php b/tests/Apple/PassFactoryTest.php
@@ -23,9 +23,9 @@ public function test_create_pass(): void
         $pass = new Coupon(
             description: 'Example description',
             organizationName: 'ACME',
-            passTypeIdentifier: 'pass.com.acme.test',
+            passTypeIdentifier: getenv('PASSES_APPLE_IDENTIFIER'),
             serialNumber: '1890038600058',
-            teamIdentifier: '12345ABCD',
+            teamIdentifier: getenv('PASSES_APPLE_TEAM_ID'),
             primaryFields: [new Field(key: 'primary', value: '::value::', label: 'Coupon')],
         );
         $pass