Dump contents as dir tree

We now dump in a directory structure:
tool
  tool1
    tool1.json
  tool2
    tool2.json
plugin
  plugin1
    plugin1.json
    plugin1-1.0.0.0.php
    plugin1-2.0.0.0.php
  plugin2
    plugin2.json
    plugin2-1.0.0.0.php

Author: discordier

src/JsonRepositoryWriter.php

@@ -91,27 +91,30 @@ public function save(): void
             }
             $data['includes'][] = $content;
         }
+        unset($tool, $content);
 
         foreach ($this->plugins as $plugin) {
             if (null === $content = $this->processPlugin($plugin)) {
                 continue;
             }
             $data['includes'][] = $content;
         }
+        unset($plugin, $content);
 
         $this->dumpFile('repository.json', $data);
+        unset($data);
 
         $flipped = array_flip($this->dumpedFileNames);
         foreach (glob($this->baseDir . '/*') as $filename) {
-            if (!array_key_exists($filename, $flipped)) {
+            if (!is_dir($filename) && !array_key_exists($filename, $flipped)) {
                 $this->filesystem->remove($filename);
             }
         }
     }
 
     private function processTool(ToolInterface $tool): ?array
     {
-        $fileName         = $tool->getName() . '-tool.json';
+        $fileName         = sprintf('tool/%1$s/%1$s.json', $tool->getName());
         $fileNameAbsolute = $this->baseDir . '/' . $fileName;
         if ($tool->isEmpty()) {
             return null;
@@ -175,18 +178,18 @@ private function encodeToolRequirements(ToolRequirements $requirements): stdClas
 
     private function processPlugin(PluginInterface $plugin): ?array
     {
-        $fileName         = $plugin->getName() . '-plugin.json';
+        $fileName         = sprintf('plugin/%1$s/%1$s.json', $plugin->getName());
         $fileNameAbsolute = $this->baseDir . '/' . $fileName;
         if ($plugin->isEmpty()) {
             return null;
         }
         $data = [];
         foreach ($plugin as $version) {
             // if file plugin, copy file - dump it otherwise.
-            $pluginFile    = $plugin->getName() . '-' . $version->getVersion() . '.php';
+            $pluginFile    = sprintf('%1$s-%2$s.php', $plugin->getName(), $version->getVersion());
             $signatureFile = $pluginFile . '.asc';
             if ($version instanceof PhpFilePluginVersion) {
-                $this->copyFile($version->getFilePath(), $pluginFile);
+                $this->copyFile($version->getFilePath(), sprintf('plugin/%1$s/%2$s', $plugin->getName(), $pluginFile));
             }
 
             $serialized = [

tests/JsonRepositoryWriterTest.php

@@ -82,8 +82,8 @@ public function testWrite(): void
             $writer->save();
 
             $this->assertFileExists($tempDir . '/repository.json');
-            $this->assertFileExists($tempDir . '/tool1-tool.json');
-            $this->assertFileExists($tempDir . '/tool2-tool.json');
+            $this->assertFileExists($tempDir . '/tool/tool1/tool1.json');
+            $this->assertFileExists($tempDir . '/tool/tool2/tool2.json');
             self::assertFileDoesNotExist($tempDir . '/file-to-remove.txt');
 
             $this->assertRepositoryFileMatches([
@@ -115,7 +115,7 @@ public function testWrite(): void
                         ],
                     ],
                 ],
-            ], $tempDir . '/tool1-tool.json');
+            ], $tempDir . '/tool/tool1/tool1.json');
             $this->assertRepositoryFileMatches([
                 'tools' => [
                     'tool2' => [
@@ -145,22 +145,22 @@ public function testWrite(): void
                         ],
                     ],
                 ],
-            ], $tempDir . '/tool2-tool.json');
+            ], $tempDir . '/tool/tool2/tool2.json');
 
             $this->assertSame([
                 'includes' => [
                     [
-                        'url'      => 'tool1-tool.json',
+                        'url'      => 'tool/tool1/tool1.json',
                         'checksum' => [
                             'type'  => 'sha-512',
-                            'value' => hash_file('sha512', $tempDir . '/tool1-tool.json'),
+                            'value' => hash_file('sha512', $tempDir . '/tool/tool1/tool1.json'),
                         ],
                     ],
                     [
-                        'url'      => 'tool2-tool.json',
+                        'url'      => 'tool/tool2/tool2.json',
                         'checksum' => [
                             'type'  => 'sha-512',
-                            'value' => hash_file('sha512', $tempDir . '/tool2-tool.json'),
+                            'value' => hash_file('sha512', $tempDir . '/tool/tool2/tool2.json'),
                         ],
                     ],
                 ],