Fixing GH Issue 21 with different datetime formats being returned

Author: sifex

src/BunnyCDNAdapter.php

@@ -152,7 +152,7 @@ protected function normalizeObject(array $bunny_file_array): StorageAttributes
                 ),
                 $bunny_file_array['Length'],
                 Visibility::PUBLIC,
-                date_create_from_format('Y-m-d\TH:i:s.v', $bunny_file_array['LastChanged'])->getTimestamp(),
+                self::parse_bunny_timestamp($bunny_file_array['LastChanged']),
                 $bunny_file_array['ContentType'],
                 $this->extractExtraMetadata($bunny_file_array)
             )
@@ -170,7 +170,7 @@ private function extractExtraMetadata(array $bunny_file_array): array
             'dirname'   => Util::splitPathIntoDirectoryAndFile($bunny_file_array['Path'])['dir'],
             'guid' => $bunny_file_array['Guid'],
             'object_name' => $bunny_file_array['ObjectName'],
-            'timestamp' => date_create_from_format('Y-m-d\TH:i:s.v', $bunny_file_array['LastChanged'])->getTimestamp(),
+            'timestamp' => self::parse_bunny_timestamp($bunny_file_array['LastChanged']),
             'server_id' => $bunny_file_array['ServerId'],
             'user_id' => $bunny_file_array['UserId'],
             'date_created' => $bunny_file_array['DateCreated'],
@@ -409,4 +409,9 @@ public function getUrl(string $path): string
 
         return rtrim($this->pullzone_url, '/') . '/' . ltrim($path, '/');
     }
+
+    private static function parse_bunny_timestamp(string $timestamp): int
+    {
+        return (date_create_from_format('Y-m-d\TH:i:s.u', $timestamp) ?: date_create_from_format('Y-m-d\TH:i:s', $timestamp))->getTimestamp();
+    }
 }

tests/FlysystemTestSuite.php

@@ -17,6 +17,7 @@
 use Mockery;
 use PlatformCommunity\Flysystem\BunnyCDN\BunnyCDNAdapter;
 use PlatformCommunity\Flysystem\BunnyCDN\BunnyCDNClient;
+use PlatformCommunity\Flysystem\BunnyCDN\Exceptions\BunnyCDNException;
 use PlatformCommunity\Flysystem\BunnyCDN\Util;
 use Throwable;
 
@@ -172,4 +173,53 @@ public function test_regression_pr_20()
             $this->assertEquals($image, stream_get_contents($stream));
         });
     }
+
+    /**
+     * Github Issue - 21
+     * https://github.com/PlatformCommunity/flysystem-bunnycdn/issues/21
+     *
+     * Issue present where the date format can come back in either one of the following formats:
+     * -    2022-04-10T17:43:49.297
+     * -    2022-04-10T17:43:49
+     *
+     * Pretty sure I'm just going to create a static method called "parse_bunny_date" within the client to handle this.
+     * @throws FilesystemException
+     */
+    public function test_regression_issue_21()
+    {
+        $client = new MockClient(self::STORAGE_ZONE, 'api-key');
+
+        $client->add_response(
+            new Response(200, [], json_encode(
+                [
+                    /**
+                     * First with the milliseconds
+                     */
+                    array_merge(
+                        $client::example_file('/example_image.png', self::STORAGE_ZONE),
+                        [
+                            'LastChanged' => date('Y-m-d\TH:i:s.v'),
+                            'DateCreated' => date('Y-m-d\TH:i:s.v'),
+                        ]
+                    ),
+                    /**
+                     * Then without
+                     */
+                    array_merge(
+                        $client::example_file('/example_image.png', self::STORAGE_ZONE),
+                        [
+                            'LastChanged' => date('Y-m-d\TH:i:s'),
+                            'DateCreated' => date('Y-m-d\TH:i:s'),
+                        ]
+                    )
+                ]
+            ))
+        );
+
+        $adapter = new Filesystem(new BunnyCDNAdapter($client));
+        $response = $adapter->listContents('/')->toArray();
+
+        $this->assertIsArray($response);
+        $this->assertCount(2, $response);
+    }
 }