Merge pull request #22 from michaelpetri/move-git-directories-under-var

added fixed location for git dirs
michaelpetri · May 11, 2023 · 1b9ab00 · 1b9ab00
2 parents c4066ae + 76eb890
commit 1b9ab00
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "symfony/process": "^6.2.7",
         "symfony/dependency-injection": "^6.2.7",
         "symfony/framework-bundle": "^6.2.7",
-        "michaelpetri/php-git": "^0.4.1"
+        "michaelpetri/php-git": "^0.5.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.15.1",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Application/DependencyInjection/TransportFactoryPass.php b/src/Application/DependencyInjection/TransportFactoryPass.php
@@ -4,16 +4,32 @@
 
 namespace MichaelPetri\SymfonyFileWatcher\Application\DependencyInjection;
 
+use MichaelPetri\Git\Value\Directory;
 use MichaelPetri\SymfonyFileWatcher\Infrastructure\Transport\FileWatcherFactory;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Reference;
 
 final class TransportFactoryPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void
     {
+        $basePathId = \sprintf('%s<%s>', Directory::class, 'symfony_file_watcher.base_path');
+
+        $projectDir = Directory::from($container->get('%kernel.project_dir%'));
+
+        $container
+            ->autowire($basePathId)
+            ->setFactory([Directory::class, 'from'])
+            ->setArguments([
+                $projectDir->sub('var')->path
+            ]);
+
         $container
             ->autowire(FileWatcherFactory::class, FileWatcherFactory::class)
+            ->setArguments([
+                new Reference($basePathId)
+            ])
             ->addTag('messenger.transport_factory');
     }
 }
diff --git a/src/Infrastructure/Transport/FileWatcherFactory.php b/src/Infrastructure/Transport/FileWatcherFactory.php
@@ -5,19 +5,28 @@
 namespace MichaelPetri\SymfonyFileWatcher\Infrastructure\Transport;
 
 use MichaelPetri\Git\GitRepository;
+use MichaelPetri\Git\Value\Directory;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Messenger\Transport\TransportFactoryInterface;
 use Symfony\Component\Messenger\Transport\TransportInterface;
 
 final class FileWatcherFactory implements TransportFactoryInterface
 {
+    public function __construct(
+        private readonly Directory $gitDirectoriesLocation
+    ) {
+    }
+
     public function createTransport(string $dsn, array $options = [], ?SerializerInterface $serializer = null): TransportInterface
     {
         $dsn = Dsn::fromString($dsn);
 
         return new EventReceiver(
             new GitRepository(
                 $dsn->directory,
+                $this->gitDirectoriesLocation
+                    ->sub('file-watcher-git')
+                    ->sub(\sha1($dsn->directory->path) . '.git'),
                 $dsn->timeout
             )
         );

diff --git a/tests/Integration/Infrastructure/Transport/EventReceiverTest.php b/tests/Integration/Infrastructure/Transport/EventReceiverTest.php
@@ -31,22 +31,26 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->directory = Directory::from(\sys_get_temp_dir() . \DIRECTORY_SEPARATOR . 'EventReceiverTest');
+        $this->directory = Directory::from(\sys_get_temp_dir())->sub('EventReceiverTest');
 
         $this->delete($this->directory);
 
         $p = new Process(['mkdir', '-p', $this->directory->path]);
         $p->mustRun();
 
-        $this->repository = new GitRepository($this->directory, Duration::inSeconds(60));
+        $this->repository = new GitRepository(
+            $this->directory,
+            $this->directory->sub('.git'),
+            Duration::inSeconds(60)
+        );
         $this->receiver = new EventReceiver($this->repository);
 
         $this->receiver->setup();
     }
 
     public function testSetup(): void
     {
-        $gitDirectory = Directory::from($this->directory->path . \DIRECTORY_SEPARATOR . '.git');
+        $gitDirectory = $this->directory->sub('.git');
 
         // Remove git file generated by test setup
         $this->delete($gitDirectory);

diff --git a/tests/Integration/Infrastructure/Transport/FileWatcherFactoryTest.php b/tests/Integration/Infrastructure/Transport/FileWatcherFactoryTest.php
@@ -4,6 +4,7 @@
 
 namespace Tests\MichaelPetri\SymfonyFileWatcher\Integration\Infrastructure\Transport;
 
+use MichaelPetri\Git\Value\Directory;
 use MichaelPetri\SymfonyFileWatcher\Infrastructure\Transport\EventReceiver;
 use MichaelPetri\SymfonyFileWatcher\Infrastructure\Transport\FileWatcherFactory;
 use PHPUnit\Framework\TestCase;
@@ -17,7 +18,9 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->factory = new FileWatcherFactory();
+        $this->factory = new FileWatcherFactory(
+            Directory::from('/tmp/')
+        );
     }
 
     public function testSupports(): void