Merge pull request #178 from stevebauman/BUG-177

Bug 177 - An error PharException occurred when trying to update files maxmind

src/Drivers/MaxMind.php

@@ -14,6 +14,7 @@
 use Illuminate\Support\Str;
 use PharData;
 use PharFileInfo;
+use RecursiveIteratorIterator;
 use Stevebauman\Location\Position;
 use Stevebauman\Location\Request;
 
@@ -41,18 +42,23 @@ public function update(Command $command): void
             $this->getDatabaseUrl()
         );
 
-        $file = $this->discoverDatabaseFile(
-            $archive = new PharData($tarFilePath)
-        );
+        $archive = new PharData($tarFilePath);
+
+        $file = $this->discoverDatabaseFile($archive);
+
+        $directory = Str::afterLast($file->getPath(), DIRECTORY_SEPARATOR);
 
-        $archive->extractTo($storage->path('/'), $file->getFilename(), true);
+        $relativePath = implode('/', [$directory, $file->getFilename()]);
+
+        $archive->extractTo($storage->path('/'), $relativePath, true);
 
         file_put_contents(
             $this->getDatabasePath(),
-            fopen($storage->path($file->getFilename()), 'r')
+            fopen($storage->path($relativePath), 'r')
         );
 
         $storage->delete($tarFileName);
+        $storage->deleteDirectory($directory);
     }
 
     /**
@@ -62,14 +68,7 @@ public function update(Command $command): void
      */
     protected function discoverDatabaseFile(PharData $archive): PharFileInfo
     {
-        /** @var \FilesystemIterator $file */
-        foreach ($archive as $file) {
-            if ($file->isDir()) {
-                return $this->discoverDatabaseFile(
-                    new PharData($file->getPathName())
-                );
-            }
-
+        foreach (new RecursiveIteratorIterator($archive) as $file) {
             if (pathinfo($file, PATHINFO_EXTENSION) === 'mmdb') {
                 return $file;
             }