Remove Storage interface and replace by StorageImpl

repman-io · Jan 7, 2021 · 8a7d397 · 8a7d397
1 parent b863acd
commit 8a7d397
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 65 deletions.
diff --git a/config/services.yaml b/config/services.yaml
@@ -63,7 +63,7 @@ services:
     Buddy\Repman\Service\Proxy\ProxyRegister:
         public: true
 
-    repman.organization.dist_storage: '@Buddy\Repman\Service\Dist\Storage\StorageImpl'
+    repman.organization.dist_storage: '@Buddy\Repman\Service\Dist\Storage\Storage'
 
     Buddy\Repman\Service\Mailer\SymfonyMailer:
         arguments:

diff --git a/src/Service/Dist/Storage.php b/src/Service/Dist/Storage.php
diff --git a/src/Service/Dist/Storage/StorageImpl.php → src/Service/Dist/Storage/Storage.php b/src/Service/Dist/Storage/StorageImpl.php → src/Service/Dist/Storage/Storage.php
@@ -5,14 +5,13 @@
 namespace Buddy\Repman\Service\Dist\Storage;
 
 use Buddy\Repman\Service\Dist;
-use Buddy\Repman\Service\Dist\Storage;
 use Buddy\Repman\Service\Downloader;
 use League\Flysystem\FileNotFoundException;
 use League\Flysystem\FilesystemInterface;
 use Munus\Control\Option;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
-final class StorageImpl implements Storage
+class Storage
 {
     private Downloader $downloader;
     private FilesystemInterface $repoFilesystem;
@@ -29,7 +28,7 @@ public function has(Dist $dist): bool
     }
 
     /**
-     * {@inheritdoc}
+     * @param string[] $headers
      */
     public function download(string $url, Dist $dist, array $headers = []): void
     {

diff --git a/src/Service/Organization/PackageManager.php b/src/Service/Organization/PackageManager.php
@@ -6,7 +6,7 @@
 
 use Buddy\Repman\Query\User\Model\PackageName;
 use Buddy\Repman\Service\Dist;
-use Buddy\Repman\Service\Dist\Storage;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use Composer\Semver\VersionParser;
 use League\Flysystem\FileNotFoundException;
 use League\Flysystem\FilesystemInterface;

diff --git a/src/Service/PackageSynchronizer/ComposerPackageSynchronizer.php b/src/Service/PackageSynchronizer/ComposerPackageSynchronizer.php
@@ -8,7 +8,7 @@
 use Buddy\Repman\Entity\Organization\Package\Version;
 use Buddy\Repman\Repository\PackageRepository;
 use Buddy\Repman\Service\Dist;
-use Buddy\Repman\Service\Dist\Storage;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use Buddy\Repman\Service\Organization\PackageManager;
 use Buddy\Repman\Service\PackageNormalizer;
 use Buddy\Repman\Service\PackageSynchronizer;

diff --git a/src/Service/ReadmeExtractor.php b/src/Service/ReadmeExtractor.php
@@ -5,7 +5,7 @@
 namespace Buddy\Repman\Service;
 
 use Buddy\Repman\Entity\Organization\Package;
-use Buddy\Repman\Service\Dist\Storage;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use League\CommonMark\CommonMarkConverter;
 use League\CommonMark\Environment;
 use League\CommonMark\Extension\ExternalLink\ExternalLinkExtension;

diff --git a/src/Service/Security/PackageScanner/SensioLabsPackageScanner.php b/src/Service/Security/PackageScanner/SensioLabsPackageScanner.php
@@ -9,7 +9,7 @@
 use Buddy\Repman\Message\Security\SendScanResult;
 use Buddy\Repman\Query\User\Model\PackageName;
 use Buddy\Repman\Repository\ScanResultRepository;
-use Buddy\Repman\Service\Dist\Storage;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use Buddy\Repman\Service\Organization\PackageManager;
 use Buddy\Repman\Service\Security\PackageScanner;
 use Buddy\Repman\Service\Security\SecurityChecker;

diff --git a/tests/Unit/Service/Organization/PackageManagerTest.php b/tests/Unit/Service/Organization/PackageManagerTest.php
@@ -6,7 +6,7 @@
 
 use Buddy\Repman\Query\User\Model\PackageName;
 use Buddy\Repman\Service\Dist;
-use Buddy\Repman\Service\Dist\Storage;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use Buddy\Repman\Service\Organization\PackageManager;
 use Buddy\Repman\Tests\Doubles\FakeDownloader;
 use League\Flysystem\Adapter\Local;
@@ -27,10 +27,10 @@ final class PackageManagerTest extends TestCase
 
     protected function setUp(): void
     {
-        $basePath = dirname(__DIR__, 3);
+        $basePath = \dirname(__DIR__, 3);
         $this->filesystem = new Filesystem(new Local($basePath.'/Resources/fixtures/'));
         $this->manager = new PackageManager(
-            new Storage\StorageImpl(
+            new Storage(
                 new FakeDownloader(), new Filesystem(new MemoryAdapter())
             ),
             $this->filesystem
@@ -85,15 +85,15 @@ public function testRemoveProvider(): void
         $manager->saveProvider([], $org, $package1);
         $manager->saveProvider([], $org, $package2);
 
-        self::assertTrue(file_exists($this->baseDir.'/buddy/p/'.$package1.'.json'));
-        self::assertTrue(file_exists($this->baseDir.'/buddy/p/'.$package2.'.json'));
+        self::assertFileExists($this->baseDir.'/buddy/p/'.$package1.'.json');
+        self::assertFileExists($this->baseDir.'/buddy/p/'.$package2.'.json');
 
         $manager->removeProvider($org, $package1);
 
-        self::assertTrue(is_dir($this->baseDir.'/buddy'));
-        self::assertTrue(is_dir(dirname($this->baseDir.'/buddy/p/'.$package1)));
-        self::assertFalse(file_exists($this->baseDir.'/buddy/p/'.$package1.'.json'));
-        self::assertTrue(file_exists($this->baseDir.'/buddy/p/'.$package2.'.json'));
+        self::assertDirectoryExists($this->baseDir.'/buddy');
+        self::assertDirectoryExists(\dirname($this->baseDir.'/buddy/p/'.$package1));
+        self::assertFileDoesNotExist($this->baseDir.'/buddy/p/'.$package1.'.json');
+        self::assertFileExists($this->baseDir.'/buddy/p/'.$package2.'.json');
     }
 
     public function testRemoveDist(): void
@@ -104,15 +104,15 @@ public function testRemoveDist(): void
         $package1 = 'vendor/package1';
         $package2 = 'vendor/package2';
 
-        @mkdir($this->baseDir.'/buddy/dist/'.$package1, 0777, true);
-        @mkdir($this->baseDir.'/buddy/dist/'.$package2, 0777, true);
+        @\mkdir($this->baseDir.'/buddy/dist/'.$package1, 0777, true);
+        @\mkdir($this->baseDir.'/buddy/dist/'.$package2, 0777, true);
 
         $manager->removeDist($org, $package1);
 
-        self::assertTrue(is_dir($this->baseDir.'/buddy'));
-        self::assertTrue(is_dir($this->baseDir.'/buddy/dist/vendor'));
-        self::assertFalse(is_dir($this->baseDir.'/buddy/dist/'.$package1));
-        self::assertTrue(is_dir($this->baseDir.'/buddy/dist/'.$package2));
+        self::assertDirectoryExists($this->baseDir.'/buddy');
+        self::assertDirectoryExists($this->baseDir.'/buddy/dist/vendor');
+        self::assertDirectoryDoesNotExist($this->baseDir.'/buddy/dist/'.$package1);
+        self::assertDirectoryExists($this->baseDir.'/buddy/dist/'.$package2);
     }
 
     public function testRemoveOrganizationDir(): void
@@ -124,20 +124,20 @@ public function testRemoveOrganizationDir(): void
 
         $manager->saveProvider([], $org, $package);
 
-        self::assertTrue(is_dir($this->baseDir.'/buddy/p/hello'));
+        self::assertDirectoryExists($this->baseDir.'/buddy/p/hello');
 
         $manager->removeProvider($org, $package)
             ->removeOrganizationDir($org);
 
-        self::assertFalse(is_dir($this->baseDir.'/buddy'));
+        self::assertDirectoryDoesNotExist($this->baseDir.'/buddy');
     }
 
     private function getManagerWithLocalStorage(): PackageManager
     {
         $repoFilesystem = new Filesystem(new Local($this->baseDir));
 
         return new PackageManager(
-            new Storage\StorageImpl(new FakeDownloader(), $repoFilesystem),
+            new Storage(new FakeDownloader(), $repoFilesystem),
             $repoFilesystem
         );
     }

diff --git a/tests/Unit/Service/PackageSynchronizer/ComposerPackageSynchronizerTest.php b/tests/Unit/Service/PackageSynchronizer/ComposerPackageSynchronizerTest.php
@@ -6,7 +6,7 @@
 
 use Buddy\Repman\Entity\Organization\Package\Version;
 use Buddy\Repman\Repository\PackageRepository;
-use Buddy\Repman\Service\Dist\Storage\StorageImpl;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use Buddy\Repman\Service\Organization\PackageManager;
 use Buddy\Repman\Service\PackageNormalizer;
 use Buddy\Repman\Service\PackageSynchronizer\ComposerPackageSynchronizer;
@@ -31,7 +31,7 @@ protected function setUp(): void
         $this->baseDir = sys_get_temp_dir().'/repman';
         $repoFilesystem = new Filesystem(new Local($this->baseDir));
         $this->downloader = new FakeDownloader();
-        $distStorage = new StorageImpl($this->downloader, $repoFilesystem);
+        $distStorage = new Storage($this->downloader, $repoFilesystem);
         $this->synchronizer = new ComposerPackageSynchronizer(
             new PackageManager($distStorage, $repoFilesystem),
             new PackageNormalizer(),

diff --git a/tests/Unit/Service/PackageSynchronizer/ReadmeComposerPackageSynchronizerTest.php b/tests/Unit/Service/PackageSynchronizer/ReadmeComposerPackageSynchronizerTest.php
@@ -5,7 +5,7 @@
 namespace Buddy\Repman\Tests\Unit\Service\PackageSynchronizer;
 
 use Buddy\Repman\Repository\PackageRepository;
-use Buddy\Repman\Service\Dist\Storage\StorageImpl;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use Buddy\Repman\Service\Organization\PackageManager;
 use Buddy\Repman\Service\PackageNormalizer;
 use Buddy\Repman\Service\PackageSynchronizer\ComposerPackageSynchronizer;
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         $baseDir = \sys_get_temp_dir().'/repman';
         $repoFilesystem = new Filesystem(new Local($baseDir));
-        $fileStorage = new StorageImpl(new FakeDownloader(''), $repoFilesystem);
+        $fileStorage = new Storage(new FakeDownloader(''), $repoFilesystem);
         $this->synchronizer = new ComposerPackageSynchronizer(
             new PackageManager(
                 $fileStorage,

diff --git a/tests/Unit/Service/Security/SensioLabsPackageScannerTest.php b/tests/Unit/Service/Security/SensioLabsPackageScannerTest.php
@@ -7,7 +7,7 @@
 use Buddy\Repman\Entity\Organization\Package;
 use Buddy\Repman\Message\Security\SendScanResult;
 use Buddy\Repman\Repository\ScanResultRepository;
-use Buddy\Repman\Service\Dist\Storage;
+use Buddy\Repman\Service\Dist\Storage\Storage;
 use Buddy\Repman\Service\Organization\PackageManager;
 use Buddy\Repman\Service\Security\PackageScanner\SensioLabsPackageScanner;
 use Buddy\Repman\Service\Security\SecurityChecker;