From dec123a3dccded7c12cebd418ec91cbff9b8fafd Mon Sep 17 00:00:00 2001
From: Patrick Durold <patrick@durold.de>
Date: Mon, 4 Mar 2024 01:26:30 +0100
Subject: [PATCH 1/6] Enable 'sync:///' protocol to rsync files from a local
 directory, add '--force' option to harness download

---
 config/services.yml                           |  1 +
 .../Repository/AggregateRepository.php        | 27 +++++++++++++------
 .../Repository/LocalSyncRepository.php        | 19 +++++++++++++
 src/Types/Workspace/Builder.php               |  4 ++-
 src/Types/Workspace/Installer.php             | 26 ++++++++++--------
 src/Types/Workspace/Workspace.php             |  4 ++-
 6 files changed, 60 insertions(+), 21 deletions(-)
 create mode 100644 src/Types/Harness/Repository/LocalSyncRepository.php

diff --git a/config/services.yml b/config/services.yml
index 76dabc27..0e939530 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -54,6 +54,7 @@ services:
   my127\Workspace\Types\Harness\Repository\Repository $packages: '@my127\Workspace\Types\Harness\Repository\AggregateRepository'
   my127\Workspace\Types\Harness\Repository\Repository $archiveRepository: '@my127\Workspace\Types\Harness\Repository\ArchiveRepository'
   my127\Workspace\Types\Harness\Repository\Repository $packageRepository: '@my127\Workspace\Types\Harness\Repository\PackageRepository'
+  my127\Workspace\Types\Harness\Repository\Repository $localSyncRepository: '@my127\Workspace\Types\Harness\Repository\LocalSyncRepository'
 
   my127\Workspace\Updater\Updater:
     arguments:
diff --git a/src/Types/Harness/Repository/AggregateRepository.php b/src/Types/Harness/Repository/AggregateRepository.php
index e5f00e3b..78f95446 100644
--- a/src/Types/Harness/Repository/AggregateRepository.php
+++ b/src/Types/Harness/Repository/AggregateRepository.php
@@ -3,26 +3,37 @@
 namespace my127\Workspace\Types\Harness\Repository;
 
 use my127\Workspace\Types\Harness\Repository\Package\Package;
+use function str_starts_with;
+use function substr;
 
 class AggregateRepository implements Repository
 {
-    /** @var Repository */
-    private $packageRepository;
+    private Repository $packageRepository;
 
-    /** @var Repository */
-    private $archiveRepository;
+    private Repository  $archiveRepository;
 
-    public function __construct(Repository $packageRepository, Repository $archiveRepository)
-    {
+    private Repository $localSyncRepository;
+
+    public function __construct(
+        Repository $packageRepository,
+        Repository $archiveRepository,
+        Repository $localSyncRepository
+    ) {
         $this->packageRepository = $packageRepository;
         $this->archiveRepository = $archiveRepository;
+        $this->localSyncRepository = $localSyncRepository;
     }
 
     public function get(string $package): Package
     {
         $parts = parse_url($package);
-        if ($parts === false || (empty($parts['scheme']) && str_contains($parts['path'], ':'))) {
-            return $this->packageRepository->get($package);
+        if ($parts === false || empty($parts['scheme'])) {
+            if (str_starts_with($package, 'sync:///')) {
+                return $this->localSyncRepository->get(substr($package, 7));
+            }
+            if (str_contains($parts['path'], ':')) {
+                return $this->packageRepository->get($package);
+            }
         }
 
         return $this->archiveRepository->get($package);
diff --git a/src/Types/Harness/Repository/LocalSyncRepository.php b/src/Types/Harness/Repository/LocalSyncRepository.php
new file mode 100644
index 00000000..4925b560
--- /dev/null
+++ b/src/Types/Harness/Repository/LocalSyncRepository.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace my127\Workspace\Types\Harness\Repository;
+
+use my127\Workspace\Types\Harness\Repository\Package\Package;
+use my127\Workspace\Types\Harness\Repository\Repository;
+
+class LocalSyncRepository implements Repository
+{
+    public function get(string $package): Package
+    {
+        return new Package([
+            'url' => rtrim($package, '/') . '/',
+            'localsync' => true,
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/src/Types/Workspace/Builder.php b/src/Types/Workspace/Builder.php
index 2ee9cd6c..c53df8ea 100644
--- a/src/Types/Workspace/Builder.php
+++ b/src/Types/Workspace/Builder.php
@@ -122,14 +122,16 @@ public function build(Environment $environment, DefinitionCollection $definition
                 ->usage('install')
                 ->option('--step=<step>   Step from which to start installer. [default: 1]')
                 ->option('--skip-events   If set events will not be triggered.')
+                ->option('--force         Force re-download and overwrite (in step=prepare)')
                 ->action(function (Input $input) {
                     $this->workspace->install($input);
                 });
 
             $this->application->section('harness download')
                 ->usage('harness download')
+                ->option('--force         Force re-download and overwrite')
                 ->action(function (Input $input) {
-                    $this->workspace->run('install --step=download');
+                    $this->workspace->run('install --step=download' . ($input->getOption('force')->value() ? ' --force' : ''));
                 });
 
             $this->application->section('harness prepare')
diff --git a/src/Types/Workspace/Installer.php b/src/Types/Workspace/Installer.php
index 644b4fbb..44a0947f 100644
--- a/src/Types/Workspace/Installer.php
+++ b/src/Types/Workspace/Installer.php
@@ -101,7 +101,7 @@ public function getStep(?string $step)
         return $this->stepMap[$step];
     }
 
-    public function install($step = null, $cascade = true, $events = true)
+    public function install($step = null, $cascade = true, $events = true, $force = false)
     {
         $packages = array_map(
             function ($harnessName) {
@@ -120,7 +120,7 @@ function ($harnessName) {
                 if ($events) {
                     $this->workspace->trigger('before.harness.install');
                 }
-                $this->downloadAndExtractHarnessPackages($packages);
+                $this->downloadAndExtractHarnessPackages($packages, $force);
                 break;
             case self::STEP_OVERLAY:
                 if (($overlayPath = $this->workspace->getOverlayPath()) !== null) {
@@ -166,24 +166,28 @@ function ($harnessName) {
     /**
      * @param Package[] $packages
      */
-    private function downloadAndExtractHarnessPackages(array $packages)
+    private function downloadAndExtractHarnessPackages(array $packages, bool $force)
     {
         $harnessInstallPath = $this->workspace->getPath() . '/.my127ws';
 
-        if (!is_dir($harnessInstallPath)) {
-            mkdir($harnessInstallPath, 0755, true);
+        if (!is_dir($harnessInstallPath) || $force ) {
+            @mkdir($harnessInstallPath, 0755, true);
             foreach ($packages as $package) {
-                $this->downloadAndExtractHarnessPackage($package);
+                $this->acquireHarnessPackage($package);
             }
         }
     }
 
-    private function downloadAndExtractHarnessPackage(Package $package): void
+    private function acquireHarnessPackage(Package $package): void
     {
-        $packageTarball = tempnam(sys_get_temp_dir(), 'my127ws');
-        file_put_contents($packageTarball, file_get_contents($package->getDist()['url']));
-        passthru('tar -zxf ' . escapeshellarg($packageTarball) . ' --strip=1 -C .my127ws');
-        unlink($packageTarball);
+        if ($package->getDist()['localsync'] ?? false) {
+            passthru('rsync -r ' . escapeshellarg($package->getDist()['url']) . ' .my127ws');
+        } else {
+            $packageTarball = tempnam(sys_get_temp_dir(), 'my127ws');
+            file_put_contents($packageTarball, file_get_contents($package->getDist()['url']));
+            passthru('tar -zxf ' . escapeshellarg($packageTarball) . ' --strip=1 -C .my127ws');
+            unlink($packageTarball);
+        }
     }
 
     private function ensureRequiredAttributesArePresent(array $required): void
diff --git a/src/Types/Workspace/Workspace.php b/src/Types/Workspace/Workspace.php
index 090de90d..a6bb5fc6 100644
--- a/src/Types/Workspace/Workspace.php
+++ b/src/Types/Workspace/Workspace.php
@@ -80,6 +80,8 @@ public function install(Input $input): void
         $step = $step instanceof StringOptionValue ? $step->value() : '';
         $cascade = true;
         $events = $input->getOption('skip-events');
+        $force = !!$input->getOption('force')?->value() ?? false;
+
         $events = $events instanceof BooleanOptionValue ? !$events->value() : true;
 
         if (!is_numeric($step)) {
@@ -87,7 +89,7 @@ public function install(Input $input): void
             $step = $installer->getStep($step);
         }
 
-        $installer->install($step, $cascade, $events);
+        $installer->install($step, $cascade, $events, $force);
     }
 
     public function refresh(): void

From 1700b55d039a45061e34f3dec67c37adfc49988e Mon Sep 17 00:00:00 2001
From: Patrick Durold <patrick@durold.de>
Date: Mon, 4 Mar 2024 01:27:05 +0100
Subject: [PATCH 2/6] Add test for local sync repo, fix constructor order

---
 .../Repository/AggregateRepositoryTest.php    | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php b/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
index 3603e2d6..390f75ff 100644
--- a/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
@@ -3,6 +3,7 @@
 namespace Test\Types\Harness\Repository;
 
 use my127\Workspace\Types\Harness\Repository\AggregateRepository;
+use my127\Workspace\Types\Harness\Repository\LocalSyncRepository;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 use my127\Workspace\Types\Harness\Repository\Repository;
 use PHPUnit\Framework\TestCase;
@@ -12,13 +13,14 @@ class AggregateRepositoryTest extends TestCase
     /** @test */
     public function itUsesPackageRepositoryForPackageNames()
     {
-        $archiveRepo = $this->createStub(Repository::class);
         $packageRepo = $this->createStub(Repository::class);
+        $archiveRepo = $this->createStub(Repository::class);
+        $localSyncRepo = $this->createStub(Repository::class);
 
         $package1 = new Package();
-        $archiveRepo->method('get')->willReturn($package1);
+        $packageRepo->method('get')->willReturn($package1);
 
-        $sut = new AggregateRepository($archiveRepo, $packageRepo);
+        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
         $got = $sut->get('inviqa/go:v0.7.0');
 
         $this->assertSame($package1, $got);
@@ -27,13 +29,14 @@ public function itUsesPackageRepositoryForPackageNames()
     /** @test */
     public function itUsesArchiveRepositoryForUrlBasedPackageNames()
     {
-        $archiveRepo = $this->createStub(Repository::class);
         $packageRepo = $this->createStub(Repository::class);
+        $archiveRepo = $this->createStub(Repository::class);
+        $localSyncRepo = $this->createStub(Repository::class);
 
         $package1 = new Package();
         $archiveRepo->method('get')->willReturn($package1);
 
-        $sut = new AggregateRepository($archiveRepo, $packageRepo);
+        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
         $got = $sut->get('https://foo.com/inviqa/go/master.tgz');
 
         $this->assertInstanceOf(Package::class, $got);
@@ -42,13 +45,14 @@ public function itUsesArchiveRepositoryForUrlBasedPackageNames()
     /** @test */
     public function itUsesArchiveRepositoryForFileUriBasedPackageNames()
     {
-        $archiveRepo = $this->createStub(Repository::class);
         $packageRepo = $this->createStub(Repository::class);
+        $archiveRepo = $this->createStub(Repository::class);
+        $localSyncRepo = $this->createStub(Repository::class);
 
         $package1 = new Package();
         $archiveRepo->method('get')->willReturn($package1);
 
-        $sut = new AggregateRepository($archiveRepo, $packageRepo);
+        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
         $got = $sut->get('file:///home/inviqa/go/master.tgz');
 
         $this->assertInstanceOf(Package::class, $got);
@@ -57,13 +61,14 @@ public function itUsesArchiveRepositoryForFileUriBasedPackageNames()
     /** @test */
     public function itUsesArchiveRepositoryForFileBasedPackageNames()
     {
-        $archiveRepo = $this->createStub(Repository::class);
         $packageRepo = $this->createStub(Repository::class);
+        $archiveRepo = $this->createStub(Repository::class);
+        $localSyncRepo = $this->createStub(Repository::class);
 
         $package1 = new Package();
         $archiveRepo->method('get')->willReturn($package1);
 
-        $sut = new AggregateRepository($archiveRepo, $packageRepo);
+        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
         $got = $sut->get('/home/inviqa/go/master.tgz');
 
         $this->assertInstanceOf(Package::class, $got);
@@ -72,15 +77,36 @@ public function itUsesArchiveRepositoryForFileBasedPackageNames()
     /** @test */
     public function itUsesArchiveRepositoryForUriWithoutPathBasedPackageNames()
     {
-        $archiveRepo = $this->createStub(Repository::class);
         $packageRepo = $this->createStub(Repository::class);
+        $archiveRepo = $this->createStub(Repository::class);
+        $localSyncRepo = $this->createStub(Repository::class);
 
         $package1 = new Package();
         $archiveRepo->method('get')->willReturn($package1);
 
-        $sut = new AggregateRepository($archiveRepo, $packageRepo);
+        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
         $got = $sut->get('example:<anything>');
 
         $this->assertInstanceOf(Package::class, $got);
     }
+
+    /** @test */
+    public function itUsesLocalSyncRepositoryForSyncUriBasedPackageNames()
+    {
+        $packageRepo = $this->createStub(Repository::class);
+        $archiveRepo = $this->createStub(Repository::class);
+        $localSyncRepo = $this->createMock(LocalSyncRepository::class);
+
+        $package1 = new Package();
+        $localSyncRepo
+            ->expects($this->once())
+            ->method('get')
+            ->with($this->equalTo('/home/inviqa/go/master'))
+            ->willReturn($package1);
+
+        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
+        $got = $sut->get('sync:///home/inviqa/go/master');
+
+        $this->assertEquals($package1, $got);
+    }
 }

From 7edae28c88898e952cc0fcbbe6dce6d47c8ac027 Mon Sep 17 00:00:00 2001
From: Patrick Durold <patrick@durold.de>
Date: Mon, 4 Mar 2024 06:51:30 +0100
Subject: [PATCH 3/6] Make repository implementations responsible for knowing
 what they handle, rewrite tests

---
 .../Repository/AggregateRepository.php        |  38 +++---
 .../Harness/Repository/ArchiveRepository.php  |   7 +-
 .../Harness/Repository/HandlingRepository.php |  10 ++
 .../Repository/LocalSyncRepository.php        |  12 +-
 .../Harness/Repository/PackageRepository.php  |   9 +-
 .../Repository/AggregateRepositoryTest.php    | 119 +++++-------------
 .../Repository/ArchiveRepositoryTest.php      |  11 ++
 .../Repository/LocalSyncRepositoryTest.php    |  29 +++++
 .../Repository/PackageRepositoryTest.php      |   9 ++
 9 files changed, 126 insertions(+), 118 deletions(-)
 create mode 100644 src/Types/Harness/Repository/HandlingRepository.php
 create mode 100644 tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php

diff --git a/src/Types/Harness/Repository/AggregateRepository.php b/src/Types/Harness/Repository/AggregateRepository.php
index 78f95446..0711ae21 100644
--- a/src/Types/Harness/Repository/AggregateRepository.php
+++ b/src/Types/Harness/Repository/AggregateRepository.php
@@ -2,40 +2,32 @@
 
 namespace my127\Workspace\Types\Harness\Repository;
 
+use Exception;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
-use function str_starts_with;
-use function substr;
 
 class AggregateRepository implements Repository
 {
-    private Repository $packageRepository;
+    /** @var HandlingRepository[] */
+    private array $repositories;
 
-    private Repository  $archiveRepository;
-
-    private Repository $localSyncRepository;
-
-    public function __construct(
-        Repository $packageRepository,
-        Repository $archiveRepository,
-        Repository $localSyncRepository
-    ) {
-        $this->packageRepository = $packageRepository;
-        $this->archiveRepository = $archiveRepository;
-        $this->localSyncRepository = $localSyncRepository;
+    public function __construct(HandlingRepository ...$repositories)
+    {
+        $this->repositories = $repositories;
     }
 
+    /**
+     * @param string $package
+     * @return Package
+     * @throws Exception
+     */
     public function get(string $package): Package
     {
-        $parts = parse_url($package);
-        if ($parts === false || empty($parts['scheme'])) {
-            if (str_starts_with($package, 'sync:///')) {
-                return $this->localSyncRepository->get(substr($package, 7));
-            }
-            if (str_contains($parts['path'], ':')) {
-                return $this->packageRepository->get($package);
+        foreach ($this->repositories as $repository) {
+            if ($repository->handles($package)) {
+                return $repository->get($package);
             }
         }
 
-        return $this->archiveRepository->get($package);
+        throw new Exception(sprintf('No handler found for URI "%s"', $package));
     }
 }
diff --git a/src/Types/Harness/Repository/ArchiveRepository.php b/src/Types/Harness/Repository/ArchiveRepository.php
index c8cd57e1..c451da13 100644
--- a/src/Types/Harness/Repository/ArchiveRepository.php
+++ b/src/Types/Harness/Repository/ArchiveRepository.php
@@ -4,8 +4,13 @@
 
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 
-class ArchiveRepository implements Repository
+class ArchiveRepository implements HandlingRepository
 {
+    public function handles(string $uri): bool
+    {
+        return true;
+    }
+
     public function get(string $package): Package
     {
         return new Package([
diff --git a/src/Types/Harness/Repository/HandlingRepository.php b/src/Types/Harness/Repository/HandlingRepository.php
new file mode 100644
index 00000000..2eb18ffd
--- /dev/null
+++ b/src/Types/Harness/Repository/HandlingRepository.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace my127\Workspace\Types\Harness\Repository;
+
+interface HandlingRepository extends Repository
+{
+    public function handles(string $uri): bool;
+}
\ No newline at end of file
diff --git a/src/Types/Harness/Repository/LocalSyncRepository.php b/src/Types/Harness/Repository/LocalSyncRepository.php
index 4925b560..37d94389 100644
--- a/src/Types/Harness/Repository/LocalSyncRepository.php
+++ b/src/Types/Harness/Repository/LocalSyncRepository.php
@@ -5,14 +5,20 @@
 namespace my127\Workspace\Types\Harness\Repository;
 
 use my127\Workspace\Types\Harness\Repository\Package\Package;
-use my127\Workspace\Types\Harness\Repository\Repository;
+use function str_starts_with;
+use function substr;
 
-class LocalSyncRepository implements Repository
+class LocalSyncRepository implements HandlingRepository
 {
+    public function handles(string $uri): bool
+    {
+        return str_starts_with($uri, 'sync:///');
+    }
+
     public function get(string $package): Package
     {
         return new Package([
-            'url' => rtrim($package, '/') . '/',
+            'url' => rtrim(substr($package, 7), '/') . '/',
             'localsync' => true,
         ]);
     }
diff --git a/src/Types/Harness/Repository/PackageRepository.php b/src/Types/Harness/Repository/PackageRepository.php
index f8e5f566..acd72e06 100644
--- a/src/Types/Harness/Repository/PackageRepository.php
+++ b/src/Types/Harness/Repository/PackageRepository.php
@@ -7,7 +7,7 @@
 use my127\Workspace\Types\Harness\Repository\Exception\UnknownPackage;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 
-class PackageRepository implements Repository
+class PackageRepository implements HandlingRepository
 {
     private const HARNESS_PACKAGE_PATTERN = '/^((?P<vendor>[a-z0-9-]+)\/)?(?P<harness>[a-z0-9-]+){1}(:(?P<version>[a-z0-9.-]+))?$/';
     private const HARNESS_VERSION_PATTERN = '/^v(?<major>[0-9x]+){1}(\.(?<minor>[0-9x]+))?(.(?<patch>[0-9x]+))?$/';
@@ -48,6 +48,13 @@ public function __construct(JsonLoader $fileLoader)
         $this->fileLoader = $fileLoader;
     }
 
+    public function handles(string $uri): bool
+    {
+        $parts = parse_url($uri);
+
+        return ($parts === false || (empty($parts['scheme']) && str_contains($parts['path'], ':')));
+    }
+
     public function get(string $package): Package
     {
         $this->importPackagesFromSources();
diff --git a/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php b/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
index 390f75ff..b496185f 100644
--- a/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
@@ -2,111 +2,50 @@
 
 namespace Test\Types\Harness\Repository;
 
+use Exception;
 use my127\Workspace\Types\Harness\Repository\AggregateRepository;
-use my127\Workspace\Types\Harness\Repository\LocalSyncRepository;
-use my127\Workspace\Types\Harness\Repository\Package\Package;
-use my127\Workspace\Types\Harness\Repository\Repository;
+use my127\Workspace\Types\Harness\Repository\HandlingRepository;
 use PHPUnit\Framework\TestCase;
 
 class AggregateRepositoryTest extends TestCase
 {
     /** @test */
-    public function itUsesPackageRepositoryForPackageNames()
+    public function itSelectsTheFirstHandlingRepository()
     {
-        $packageRepo = $this->createStub(Repository::class);
-        $archiveRepo = $this->createStub(Repository::class);
-        $localSyncRepo = $this->createStub(Repository::class);
-
-        $package1 = new Package();
-        $packageRepo->method('get')->willReturn($package1);
-
-        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
-        $got = $sut->get('inviqa/go:v0.7.0');
-
-        $this->assertSame($package1, $got);
-    }
-
-    /** @test */
-    public function itUsesArchiveRepositoryForUrlBasedPackageNames()
-    {
-        $packageRepo = $this->createStub(Repository::class);
-        $archiveRepo = $this->createStub(Repository::class);
-        $localSyncRepo = $this->createStub(Repository::class);
-
-        $package1 = new Package();
-        $archiveRepo->method('get')->willReturn($package1);
-
-        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
-        $got = $sut->get('https://foo.com/inviqa/go/master.tgz');
-
-        $this->assertInstanceOf(Package::class, $got);
-    }
-
-    /** @test */
-    public function itUsesArchiveRepositoryForFileUriBasedPackageNames()
-    {
-        $packageRepo = $this->createStub(Repository::class);
-        $archiveRepo = $this->createStub(Repository::class);
-        $localSyncRepo = $this->createStub(Repository::class);
-
-        $package1 = new Package();
-        $archiveRepo->method('get')->willReturn($package1);
-
-        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
-        $got = $sut->get('file:///home/inviqa/go/master.tgz');
-
-        $this->assertInstanceOf(Package::class, $got);
-    }
-
-    /** @test */
-    public function itUsesArchiveRepositoryForFileBasedPackageNames()
-    {
-        $packageRepo = $this->createStub(Repository::class);
-        $archiveRepo = $this->createStub(Repository::class);
-        $localSyncRepo = $this->createStub(Repository::class);
-
-        $package1 = new Package();
-        $archiveRepo->method('get')->willReturn($package1);
-
-        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
-        $got = $sut->get('/home/inviqa/go/master.tgz');
-
-        $this->assertInstanceOf(Package::class, $got);
-    }
-
-    /** @test */
-    public function itUsesArchiveRepositoryForUriWithoutPathBasedPackageNames()
-    {
-        $packageRepo = $this->createStub(Repository::class);
-        $archiveRepo = $this->createStub(Repository::class);
-        $localSyncRepo = $this->createStub(Repository::class);
-
-        $package1 = new Package();
-        $archiveRepo->method('get')->willReturn($package1);
+        $repoNo = $this->createMock(HandlingRepository::class);
+        $repoNo
+            ->method('handles')
+            ->willReturn(false);
+        $repoNo
+            ->expects($this->never())
+            ->method('get');
+
+        $repoYes = $this->createMock(HandlingRepository::class);
+        $repoYes
+            ->method('handles')
+            ->willReturn(true);
+
+        $repoYes
+            ->expects($this->once())
+            ->method('get');
 
-        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
-        $got = $sut->get('example:<anything>');
+        $sut = new AggregateRepository($repoNo, $repoYes);
 
-        $this->assertInstanceOf(Package::class, $got);
+        $sut->get('foobar');
     }
 
     /** @test */
-    public function itUsesLocalSyncRepositoryForSyncUriBasedPackageNames()
+    public function itThrowsAnExceptionWhenNoRepositoryHandles()
     {
-        $packageRepo = $this->createStub(Repository::class);
-        $archiveRepo = $this->createStub(Repository::class);
-        $localSyncRepo = $this->createMock(LocalSyncRepository::class);
+        $repoNo = $this->createMock(HandlingRepository::class);
+        $repoNo
+            ->method('handles')
+            ->willReturn(false);
 
-        $package1 = new Package();
-        $localSyncRepo
-            ->expects($this->once())
-            ->method('get')
-            ->with($this->equalTo('/home/inviqa/go/master'))
-            ->willReturn($package1);
+        $sut = new AggregateRepository($repoNo);
 
-        $sut = new AggregateRepository($packageRepo, $archiveRepo, $localSyncRepo);
-        $got = $sut->get('sync:///home/inviqa/go/master');
+        $this->expectException(Exception::class);
 
-        $this->assertEquals($package1, $got);
+        $sut->get('foobar');
     }
 }
diff --git a/tests/Test/Types/Harness/Repository/ArchiveRepositoryTest.php b/tests/Test/Types/Harness/Repository/ArchiveRepositoryTest.php
index 784b5c7c..c11ca98c 100644
--- a/tests/Test/Types/Harness/Repository/ArchiveRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/ArchiveRepositoryTest.php
@@ -16,4 +16,15 @@ public function itCreatesAPackageFromThePackageUrl()
 
         $this->assertEquals(new Package(['url' => 'https://github.com/inviqa/harness-go/archive/master.tar.gz']), $got);
     }
+
+    /** @test */
+    public function itHandlesAllUrls()
+    {
+        $sut = new ArchiveRepository();
+
+        $this->assertTrue($sut->handles('https://foo.com/inviqa/go/master.tgz'));
+        $this->assertTrue($sut->handles('file:///home/inviqa/go/master.tgz'));
+        $this->assertTrue($sut->handles('/home/inviqa/go/master.tgz'));
+        $this->assertTrue($sut->handles('example:<anything>'));
+    }
 }
diff --git a/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php b/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
new file mode 100644
index 00000000..386738bb
--- /dev/null
+++ b/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Test\Types\Harness\Repository;
+
+use my127\Workspace\Types\Harness\Repository\ArchiveRepository;
+use my127\Workspace\Types\Harness\Repository\LocalSyncRepository;
+use my127\Workspace\Types\Harness\Repository\Package\Package;
+use PHPUnit\Framework\TestCase;
+
+class LocalSyncRepositoryTest extends TestCase
+{
+    /** @test */
+    public function itCreatesAPackageFromThePackageUrl()
+    {
+        $sut = new LocalSyncRepository();
+        $got = $sut->get('sync:///foo/bar');
+
+        $this->assertEquals(new Package(['url' => '/foo/bar/', 'localsync' => true]), $got);
+    }
+
+    /* @test **/
+    public function itHandlesOnlySyncUrls()
+    {
+        $sut = new LocalSyncRepository();
+
+        $this->assertTrue($sut->handles('sync:///foo/bar'));
+        $this->assertFalse($sut->handles('file:///foo/bar'));
+    }
+}
diff --git a/tests/Test/Types/Harness/Repository/PackageRepositoryTest.php b/tests/Test/Types/Harness/Repository/PackageRepositoryTest.php
index bb52d2e5..404c0edd 100644
--- a/tests/Test/Types/Harness/Repository/PackageRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/PackageRepositoryTest.php
@@ -11,6 +11,15 @@
 
 class PackageRepositoryTest extends IntegrationTestCase
 {
+    /** @test */
+    public function itHandlesPackageNames()
+    {
+        $sut = $this->createRepository();
+
+        $this->assertTrue($sut->handles('test/package:v2.0.0'));
+        $this->assertFalse($sut->handles('foobar'));
+    }
+
     /** @test */
     public function itThrowsExceptionWhenRequestingAnInvalidPackageName(): void
     {

From e2eb148bb8e3c9e4a71f72d5295ef997d086b595 Mon Sep 17 00:00:00 2001
From: Patrick Durold <patrick@durold.de>
Date: Mon, 4 Mar 2024 21:08:49 +0100
Subject: [PATCH 4/6] Understand Symfony DI, fix yml download

---
 config/services.yml                                   | 11 +++++++----
 src/Types/Harness/Repository/LocalSyncRepository.php  |  4 ++--
 src/Types/Workspace/Creator.php                       |  4 ++++
 .../Harness/Repository/LocalSyncRepositoryTest.php    |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/config/services.yml b/config/services.yml
index 0e939530..3de80a79 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -47,14 +47,17 @@ services:
   my127\Console\:
     resource: '../packages/Console/src/*'
 
-  my127\Workspace\Types\Harness\Repository\AggregateRepository: ~
+  my127\Workspace\Types\Harness\Repository\AggregateRepository:
+    arguments:
+      - '@my127\Workspace\Types\Harness\Repository\PackageRepository'
+      - '@my127\Workspace\Types\Harness\Repository\LocalSyncRepository'
+      - '@my127\Workspace\Types\Harness\Repository\ArchiveRepository'
+
   my127\Workspace\Types\Harness\Repository\ArchiveRepository: ~
   my127\Workspace\Types\Harness\Repository\PackageRepository: ~
+  my127\Workspace\Types\Harness\Repository\LocalSyncRepository: ~
 
   my127\Workspace\Types\Harness\Repository\Repository $packages: '@my127\Workspace\Types\Harness\Repository\AggregateRepository'
-  my127\Workspace\Types\Harness\Repository\Repository $archiveRepository: '@my127\Workspace\Types\Harness\Repository\ArchiveRepository'
-  my127\Workspace\Types\Harness\Repository\Repository $packageRepository: '@my127\Workspace\Types\Harness\Repository\PackageRepository'
-  my127\Workspace\Types\Harness\Repository\Repository $localSyncRepository: '@my127\Workspace\Types\Harness\Repository\LocalSyncRepository'
 
   my127\Workspace\Updater\Updater:
     arguments:
diff --git a/src/Types/Harness/Repository/LocalSyncRepository.php b/src/Types/Harness/Repository/LocalSyncRepository.php
index 37d94389..1ac318bd 100644
--- a/src/Types/Harness/Repository/LocalSyncRepository.php
+++ b/src/Types/Harness/Repository/LocalSyncRepository.php
@@ -12,13 +12,13 @@ class LocalSyncRepository implements HandlingRepository
 {
     public function handles(string $uri): bool
     {
-        return str_starts_with($uri, 'sync:///');
+        return str_starts_with($uri, 'sync://');
     }
 
     public function get(string $package): Package
     {
         return new Package([
-            'url' => rtrim(substr($package, 7), '/') . '/',
+            'url' => rtrim(substr($package, 6), '/') . '/',
             'localsync' => true,
         ]);
     }
diff --git a/src/Types/Workspace/Creator.php b/src/Types/Workspace/Creator.php
index b45129b8..5de15e02 100644
--- a/src/Types/Workspace/Creator.php
+++ b/src/Types/Workspace/Creator.php
@@ -91,6 +91,10 @@ private function parseYamlMergeStreams($content): array
 
     private function downloadAndExtractHarnessYml(Package $package): string
     {
+        if ($package->getDist()['localsync'] ?? false) {
+            return file_get_contents($package->getDist()['url'] . 'harness.yml');
+        }
+
         $packageTarball = tempnam(sys_get_temp_dir(), 'my127ws');
         file_put_contents($packageTarball, file_get_contents($package->getDist()['url']));
 
diff --git a/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php b/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
index 386738bb..5df86e6b 100644
--- a/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
@@ -13,7 +13,7 @@ class LocalSyncRepositoryTest extends TestCase
     public function itCreatesAPackageFromThePackageUrl()
     {
         $sut = new LocalSyncRepository();
-        $got = $sut->get('sync:///foo/bar');
+        $got = $sut->get('sync://foo/bar');
 
         $this->assertEquals(new Package(['url' => '/foo/bar/', 'localsync' => true]), $got);
     }
@@ -23,7 +23,7 @@ public function itHandlesOnlySyncUrls()
     {
         $sut = new LocalSyncRepository();
 
-        $this->assertTrue($sut->handles('sync:///foo/bar'));
+        $this->assertTrue($sut->handles('sync://foo/bar'));
         $this->assertFalse($sut->handles('file:///foo/bar'));
     }
 }

From 2dbe51f4d0d919568fcbc10b85522e96a232e06a Mon Sep 17 00:00:00 2001
From: Patrick Durold <patrick@durold.de>
Date: Thu, 14 Mar 2024 03:42:01 +0100
Subject: [PATCH 5/6] Add experimental GITHUB+SSH support for harness layers

---
 .gitignore                                    |  1 +
 composer.json                                 |  3 +-
 composer.lock                                 | 56 ++++++++++++++++++-
 config/services.yml                           |  4 +-
 .../Harness/Repository/GithubRepository.php   | 35 ++++++++++++
 src/Types/Workspace/Creator.php               | 20 ++++++-
 src/Types/Workspace/Installer.php             |  9 +++
 src/Utility/Filesystem.php                    | 31 ++++++++++
 src/Utility/TmpNamType.php                    | 12 ++++
 .../Harness/Repository/GitRepositoryTest.php  | 28 ++++++++++
 10 files changed, 193 insertions(+), 6 deletions(-)
 create mode 100644 src/Types/Harness/Repository/GithubRepository.php
 create mode 100644 src/Utility/TmpNamType.php
 create mode 100644 tests/Test/Types/Harness/Repository/GitRepositoryTest.php

diff --git a/.gitignore b/.gitignore
index 9cfbdffc..1e7fd755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /tests/WorkspaceHome
 /tests/Test/Updater/fixtures/generated
 /.php-cs-fixer.cache
+.idea/
\ No newline at end of file
diff --git a/composer.json b/composer.json
index e13da467..cea58a8f 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,8 @@
         "symfony/finder": "^6.1",
         "symfony/yaml": "^6.1",
         "twig/twig": "^2.13",
-        "composer/semver": "^3.3"
+        "composer/semver": "^3.3",
+        "czproject/git-php": "^4.2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.2",
diff --git a/composer.lock b/composer.lock
index 1be7ef6b..9fcc51c2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c0e6bd3ea771120e163c7cbb1adcf80b",
+    "content-hash": "e2d31ab744dc6a55ca9a4e1d5c69856b",
     "packages": [
         {
             "name": "composer/semver",
@@ -87,6 +87,58 @@
             ],
             "time": "2022-04-01T19:23:25+00:00"
         },
+        {
+            "name": "czproject/git-php",
+            "version": "v4.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/czproject/git-php.git",
+                "reference": "e257f2c3b43fe8fef19ddb5727b604416b423107"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/czproject/git-php/zipball/e257f2c3b43fe8fef19ddb5727b604416b423107",
+                "reference": "e257f2c3b43fe8fef19ddb5727b604416b423107",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "require-dev": {
+                "nette/tester": "^2.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Pecha",
+                    "email": "janpecha@email.cz"
+                }
+            ],
+            "description": "Library for work with Git repository in PHP.",
+            "keywords": [
+                "git"
+            ],
+            "support": {
+                "issues": "https://github.com/czproject/git-php/issues",
+                "source": "https://github.com/czproject/git-php/tree/v4.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.janpecha.cz/donate/git-php/",
+                    "type": "other"
+                }
+            ],
+            "time": "2023-07-12T09:14:30+00:00"
+        },
         {
             "name": "psr/cache",
             "version": "3.0.0",
@@ -4670,5 +4722,5 @@
         "php": "^8.1"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/config/services.yml b/config/services.yml
index 3de80a79..b4136197 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -51,11 +51,13 @@ services:
     arguments:
       - '@my127\Workspace\Types\Harness\Repository\PackageRepository'
       - '@my127\Workspace\Types\Harness\Repository\LocalSyncRepository'
-      - '@my127\Workspace\Types\Harness\Repository\ArchiveRepository'
+      - '@my127\Workspace\Types\Harness\Repository\GithubRepository'
+      - '@my127\Workspace\Types\Harness\Repository\ArchiveRepository' # this is catch-all and must stay last
 
   my127\Workspace\Types\Harness\Repository\ArchiveRepository: ~
   my127\Workspace\Types\Harness\Repository\PackageRepository: ~
   my127\Workspace\Types\Harness\Repository\LocalSyncRepository: ~
+  my127\Workspace\Types\Harness\Repository\GithubRepository: ~
 
   my127\Workspace\Types\Harness\Repository\Repository $packages: '@my127\Workspace\Types\Harness\Repository\AggregateRepository'
 
diff --git a/src/Types/Harness/Repository/GithubRepository.php b/src/Types/Harness/Repository/GithubRepository.php
new file mode 100644
index 00000000..84e4d192
--- /dev/null
+++ b/src/Types/Harness/Repository/GithubRepository.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace my127\Workspace\Types\Harness\Repository;
+
+use Exception;
+use my127\Workspace\Types\Harness\Repository\Package\Package;
+use function preg_match;
+
+class GithubRepository implements HandlingRepository
+{
+    // format: github:git@github.com:inviqa/harness-base-php.git:0.4.x
+    const PATTERN = '#^github:(?<urn>.+):(?<ref>[^:]+)$#';
+    const KEY_REF = 'ref';
+    const KEY_URN = 'urn';
+
+    public function handles(string $uri): bool
+    {
+        return (bool)preg_match(self::PATTERN, $uri);
+    }
+
+    public function get(string $package): Package
+    {
+        if (!preg_match(self::PATTERN, $package, $matches)) {
+            throw new Exception("Package '$package' not matching git URL pattern.");
+        }
+
+        return new Package([
+            'url' => $matches[self::KEY_URN],
+            'ref' => $matches[self::KEY_REF],
+            'git' => true,
+        ]);
+    }
+}
\ No newline at end of file
diff --git a/src/Types/Workspace/Creator.php b/src/Types/Workspace/Creator.php
index 5de15e02..6e4b50db 100644
--- a/src/Types/Workspace/Creator.php
+++ b/src/Types/Workspace/Creator.php
@@ -5,7 +5,11 @@
 use my127\Workspace\Types\Crypt\Key;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 use my127\Workspace\Types\Harness\Repository\Repository;
+use my127\Workspace\Utility\Filesystem;
+use my127\Workspace\Utility\TmpNamType;
 use Symfony\Component\Yaml\Yaml;
+use CzProject\GitPhp\Git;
+use function unlink;
 
 class Creator
 {
@@ -52,7 +56,7 @@ private function findHarnessLayers(string $harness): array
 
         $harnessLayers = [$harness];
 
-        $harnessData = $this->parseYamlMergeStreams($this->downloadAndExtractHarnessYml($package));
+        $harnessData = $this->parseYamlMergeStreams($this->acquireAndExtractHarnessYml($package));
         if (!is_array($harnessData)) {
             throw new \Exception('Could not parse the harness\'s harness.yml file');
         }
@@ -89,12 +93,24 @@ private function parseYamlMergeStreams($content): array
         return $mergedDocument;
     }
 
-    private function downloadAndExtractHarnessYml(Package $package): string
+    private function acquireAndExtractHarnessYml(Package $package): string
     {
         if ($package->getDist()['localsync'] ?? false) {
             return file_get_contents($package->getDist()['url'] . 'harness.yml');
         }
 
+        if ($package->getDist()['git'] ?? false) {
+            $packageDirPath = Filesystem::tempname(TmpNamType::PATH);
+
+            $git = new Git();
+            $git->cloneRepository($package->getDist()['url'], $packageDirPath, ['-q', '--depth', '1', '--branch', $package->getDist()['ref']]);
+
+            $yaml = file_get_contents($packageDirPath . '/harness.yml');
+            Filesystem::rrmdir($packageDirPath);
+
+            return $yaml;
+        }
+
         $packageTarball = tempnam(sys_get_temp_dir(), 'my127ws');
         file_put_contents($packageTarball, file_get_contents($package->getDist()['url']));
 
diff --git a/src/Types/Workspace/Installer.php b/src/Types/Workspace/Installer.php
index 44a0947f..360f3fd6 100644
--- a/src/Types/Workspace/Installer.php
+++ b/src/Types/Workspace/Installer.php
@@ -3,6 +3,7 @@
 namespace my127\Workspace\Types\Workspace;
 
 use Composer\Semver\Semver;
+use CzProject\GitPhp\Git;
 use my127\Workspace\Application;
 use my127\Workspace\Path\Path;
 use my127\Workspace\Terminal\Terminal;
@@ -12,6 +13,8 @@
 use my127\Workspace\Types\Harness\Harness;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 use my127\Workspace\Types\Harness\Repository\Repository;
+use my127\Workspace\Utility\Filesystem;
+use my127\Workspace\Utility\TmpNamType;
 use Symfony\Component\Yaml\Yaml;
 
 class Installer
@@ -182,6 +185,12 @@ private function acquireHarnessPackage(Package $package): void
     {
         if ($package->getDist()['localsync'] ?? false) {
             passthru('rsync -r ' . escapeshellarg($package->getDist()['url']) . ' .my127ws');
+        } else if($package->getDist()['git'] ?? false) {
+            $packageDirPath = Filesystem::tempname(TmpNamType::PATH);
+            $git = new Git();
+            $git->cloneRepository($package->getDist()['url'], $packageDirPath, ['-q', '--depth', '1', '--branch', $package->getDist()['ref']]);
+            passthru('rsync -r --exclude .git/ ' . escapeshellarg($packageDirPath) . '/ .my127ws');
+            Filesystem::rrmdir($packageDirPath);
         } else {
             $packageTarball = tempnam(sys_get_temp_dir(), 'my127ws');
             file_put_contents($packageTarball, file_get_contents($package->getDist()['url']));
diff --git a/src/Utility/Filesystem.php b/src/Utility/Filesystem.php
index 3a516570..e7c283ce 100644
--- a/src/Utility/Filesystem.php
+++ b/src/Utility/Filesystem.php
@@ -2,8 +2,12 @@
 
 namespace my127\Workspace\Utility;
 
+use function mkdir;
+
 class Filesystem
 {
+    public const TMPNAM_DEFAULT_PREFIX = 'my127ws';
+
     public static function upsearch(string $name, string $startFrom): ?string
     {
         $path = null;
@@ -75,4 +79,31 @@ public static function rsearch($folder, $pattern)
 
         return $fileList;
     }
+
+    public static function tempname(TmpNamType $type = TmpNamType::PATH, string $prefix = self::TMPNAM_DEFAULT_PREFIX): string
+    {
+        if (false === ($tmpFilePath = tempnam(sys_get_temp_dir(), $prefix))) {
+            throw new \Exception('Could not create temporary ' . $type->value);
+        }
+
+        if ($type === TmpNamType::FILE) {
+            return $tmpFilePath;
+        }
+
+
+        if (false === unlink($tmpFilePath)) {
+            throw new \Exception('Could not remove temporary filepath ' . $tmpFilePath);
+        }
+
+        if ($type === TmpNamType::PATH) {
+            return $tmpFilePath;
+        }
+
+        mkdir($tmpFilePath, 0777, true);
+        if (false === mkdir($tmpFilePath, 0777, true)) {
+            throw new \Exception('Could not create temporary directory ' . $tmpFilePath);
+        }
+
+        return $tmpFilePath;
+    }
 }
diff --git a/src/Utility/TmpNamType.php b/src/Utility/TmpNamType.php
new file mode 100644
index 00000000..e294d571
--- /dev/null
+++ b/src/Utility/TmpNamType.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace my127\Workspace\Utility;
+
+enum TmpNamType: string
+{
+    case DIR = 'directory';
+    case FILE = 'file';
+    case PATH = 'path';
+}
diff --git a/tests/Test/Types/Harness/Repository/GitRepositoryTest.php b/tests/Test/Types/Harness/Repository/GitRepositoryTest.php
new file mode 100644
index 00000000..6694c565
--- /dev/null
+++ b/tests/Test/Types/Harness/Repository/GitRepositoryTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Test\Types\Harness\Repository;
+
+use my127\Workspace\Types\Harness\Repository\GithubRepository;
+use my127\Workspace\Types\Harness\Repository\Package\Package;
+use PHPUnit\Framework\TestCase;
+
+class GitRepositoryTest extends TestCase
+{
+    /** @test */
+    public function itCreatesAPackageFromThePackageUrl()
+    {
+        $sut = new GithubRepository();
+        $got = $sut->get('github:git@github.com:inviqa/harness-base-php.git:0.4.x');
+
+        $this->assertEquals(new Package(['url' => 'git@github.com:inviqa/harness-base-php.git', 'ref' => '0.4.x', 'git' => true]), $got);
+    }
+
+    /* @test **/
+    public function itHandlesOnlyGithubSshUrls()
+    {
+        $sut = new GithubRepository();
+
+        $this->assertTrue($sut->handles('github:git@github.com:inviqa/harness-base-php.git:0.4.x'));
+        $this->assertFalse($sut->handles('inviqa/harness-foo:v1.2.3'));
+    }
+}

From 558263d44b506e74dd2936024a2af85f7e7e428b Mon Sep 17 00:00:00 2001
From: Patrick Durold <patrick@durold.de>
Date: Thu, 14 Mar 2024 03:58:56 +0100
Subject: [PATCH 6/6] CS and PHPSTAN fixes

---
 .../Harness/Repository/AggregateRepository.php   |  7 ++-----
 .../Harness/Repository/GithubRepository.php      | 16 +++++++---------
 .../Harness/Repository/HandlingRepository.php    |  2 +-
 .../Harness/Repository/LocalSyncRepository.php   |  8 +++-----
 .../Harness/Repository/PackageRepository.php     |  2 +-
 src/Types/Workspace/Creator.php                  |  7 +++----
 src/Types/Workspace/Installer.php                |  4 ++--
 src/Types/Workspace/Workspace.php                |  2 +-
 src/Utility/Filesystem.php                       | 11 ++++-------
 .../Repository/AggregateRepositoryTest.php       |  3 +--
 .../Harness/Repository/GitRepositoryTest.php     |  2 +-
 .../Repository/LocalSyncRepositoryTest.php       |  3 +--
 12 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/src/Types/Harness/Repository/AggregateRepository.php b/src/Types/Harness/Repository/AggregateRepository.php
index 0711ae21..44672b1a 100644
--- a/src/Types/Harness/Repository/AggregateRepository.php
+++ b/src/Types/Harness/Repository/AggregateRepository.php
@@ -2,7 +2,6 @@
 
 namespace my127\Workspace\Types\Harness\Repository;
 
-use Exception;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 
 class AggregateRepository implements Repository
@@ -16,9 +15,7 @@ public function __construct(HandlingRepository ...$repositories)
     }
 
     /**
-     * @param string $package
-     * @return Package
-     * @throws Exception
+     * @throws \Exception
      */
     public function get(string $package): Package
     {
@@ -28,6 +25,6 @@ public function get(string $package): Package
             }
         }
 
-        throw new Exception(sprintf('No handler found for URI "%s"', $package));
+        throw new \Exception(sprintf('No handler found for URI "%s"', $package));
     }
 }
diff --git a/src/Types/Harness/Repository/GithubRepository.php b/src/Types/Harness/Repository/GithubRepository.php
index 84e4d192..8f7ed203 100644
--- a/src/Types/Harness/Repository/GithubRepository.php
+++ b/src/Types/Harness/Repository/GithubRepository.php
@@ -4,26 +4,24 @@
 
 namespace my127\Workspace\Types\Harness\Repository;
 
-use Exception;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
-use function preg_match;
 
 class GithubRepository implements HandlingRepository
 {
     // format: github:git@github.com:inviqa/harness-base-php.git:0.4.x
-    const PATTERN = '#^github:(?<urn>.+):(?<ref>[^:]+)$#';
-    const KEY_REF = 'ref';
-    const KEY_URN = 'urn';
+    public const PATTERN = '#^github:(?<urn>.+):(?<ref>[^:]+)$#';
+    public const KEY_REF = 'ref';
+    public const KEY_URN = 'urn';
 
     public function handles(string $uri): bool
     {
-        return (bool)preg_match(self::PATTERN, $uri);
+        return (bool) \preg_match(self::PATTERN, $uri);
     }
 
     public function get(string $package): Package
     {
-        if (!preg_match(self::PATTERN, $package, $matches)) {
-            throw new Exception("Package '$package' not matching git URL pattern.");
+        if (!\preg_match(self::PATTERN, $package, $matches)) {
+            throw new \Exception("Package '$package' not matching git URL pattern.");
         }
 
         return new Package([
@@ -32,4 +30,4 @@ public function get(string $package): Package
             'git' => true,
         ]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Types/Harness/Repository/HandlingRepository.php b/src/Types/Harness/Repository/HandlingRepository.php
index 2eb18ffd..43264358 100644
--- a/src/Types/Harness/Repository/HandlingRepository.php
+++ b/src/Types/Harness/Repository/HandlingRepository.php
@@ -7,4 +7,4 @@
 interface HandlingRepository extends Repository
 {
     public function handles(string $uri): bool;
-}
\ No newline at end of file
+}
diff --git a/src/Types/Harness/Repository/LocalSyncRepository.php b/src/Types/Harness/Repository/LocalSyncRepository.php
index 1ac318bd..1357deb8 100644
--- a/src/Types/Harness/Repository/LocalSyncRepository.php
+++ b/src/Types/Harness/Repository/LocalSyncRepository.php
@@ -5,21 +5,19 @@
 namespace my127\Workspace\Types\Harness\Repository;
 
 use my127\Workspace\Types\Harness\Repository\Package\Package;
-use function str_starts_with;
-use function substr;
 
 class LocalSyncRepository implements HandlingRepository
 {
     public function handles(string $uri): bool
     {
-        return str_starts_with($uri, 'sync://');
+        return \str_starts_with($uri, 'sync://');
     }
 
     public function get(string $package): Package
     {
         return new Package([
-            'url' => rtrim(substr($package, 6), '/') . '/',
+            'url' => rtrim(\substr($package, 6), '/') . '/',
             'localsync' => true,
         ]);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Types/Harness/Repository/PackageRepository.php b/src/Types/Harness/Repository/PackageRepository.php
index acd72e06..4486b054 100644
--- a/src/Types/Harness/Repository/PackageRepository.php
+++ b/src/Types/Harness/Repository/PackageRepository.php
@@ -52,7 +52,7 @@ public function handles(string $uri): bool
     {
         $parts = parse_url($uri);
 
-        return ($parts === false || (empty($parts['scheme']) && str_contains($parts['path'], ':')));
+        return $parts === false || (empty($parts['scheme']) && str_contains($parts['path'], ':'));
     }
 
     public function get(string $package): Package
diff --git a/src/Types/Workspace/Creator.php b/src/Types/Workspace/Creator.php
index 6e4b50db..e6d191d3 100644
--- a/src/Types/Workspace/Creator.php
+++ b/src/Types/Workspace/Creator.php
@@ -2,14 +2,13 @@
 
 namespace my127\Workspace\Types\Workspace;
 
+use CzProject\GitPhp\Git;
 use my127\Workspace\Types\Crypt\Key;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 use my127\Workspace\Types\Harness\Repository\Repository;
 use my127\Workspace\Utility\Filesystem;
 use my127\Workspace\Utility\TmpNamType;
 use Symfony\Component\Yaml\Yaml;
-use CzProject\GitPhp\Git;
-use function unlink;
 
 class Creator
 {
@@ -118,7 +117,7 @@ private function acquireAndExtractHarnessYml(Package $package): string
         if ($packageDir === false) {
             throw new \Exception('Could not create temporary directory for harness');
         }
-        unlink($packageDir);
+        \unlink($packageDir);
         if (!mkdir($packageDir, 0700)) {
             throw new \Exception('Could not create temporary ' . $packageDir . ' directory for harness');
         }
@@ -132,7 +131,7 @@ private function acquireAndExtractHarnessYml(Package $package): string
         if (is_dir($packageDir)) {
             exec('rm -rf ' . escapeshellarg($packageDir));
         }
-        unlink($packageTarball);
+        \unlink($packageTarball);
 
         if ($harnessYaml === false) {
             throw new \Exception('Could not parse the harness\'s harness.yml file');
diff --git a/src/Types/Workspace/Installer.php b/src/Types/Workspace/Installer.php
index 360f3fd6..1a78dffc 100644
--- a/src/Types/Workspace/Installer.php
+++ b/src/Types/Workspace/Installer.php
@@ -173,7 +173,7 @@ private function downloadAndExtractHarnessPackages(array $packages, bool $force)
     {
         $harnessInstallPath = $this->workspace->getPath() . '/.my127ws';
 
-        if (!is_dir($harnessInstallPath) || $force ) {
+        if (!is_dir($harnessInstallPath) || $force) {
             @mkdir($harnessInstallPath, 0755, true);
             foreach ($packages as $package) {
                 $this->acquireHarnessPackage($package);
@@ -185,7 +185,7 @@ private function acquireHarnessPackage(Package $package): void
     {
         if ($package->getDist()['localsync'] ?? false) {
             passthru('rsync -r ' . escapeshellarg($package->getDist()['url']) . ' .my127ws');
-        } else if($package->getDist()['git'] ?? false) {
+        } elseif ($package->getDist()['git'] ?? false) {
             $packageDirPath = Filesystem::tempname(TmpNamType::PATH);
             $git = new Git();
             $git->cloneRepository($package->getDist()['url'], $packageDirPath, ['-q', '--depth', '1', '--branch', $package->getDist()['ref']]);
diff --git a/src/Types/Workspace/Workspace.php b/src/Types/Workspace/Workspace.php
index a6bb5fc6..d894aa49 100644
--- a/src/Types/Workspace/Workspace.php
+++ b/src/Types/Workspace/Workspace.php
@@ -80,7 +80,7 @@ public function install(Input $input): void
         $step = $step instanceof StringOptionValue ? $step->value() : '';
         $cascade = true;
         $events = $input->getOption('skip-events');
-        $force = !!$input->getOption('force')?->value() ?? false;
+        $force = (bool) $input->getOption('force')->value();
 
         $events = $events instanceof BooleanOptionValue ? !$events->value() : true;
 
diff --git a/src/Utility/Filesystem.php b/src/Utility/Filesystem.php
index e7c283ce..643c5c0e 100644
--- a/src/Utility/Filesystem.php
+++ b/src/Utility/Filesystem.php
@@ -2,8 +2,6 @@
 
 namespace my127\Workspace\Utility;
 
-use function mkdir;
-
 class Filesystem
 {
     public const TMPNAM_DEFAULT_PREFIX = 'my127ws';
@@ -48,7 +46,7 @@ public static function rcopy($src, $dst)
         $dir = opendir($src);
 
         if (!is_dir($dst)) {
-            mkdir($dst);
+            \mkdir($dst);
         }
 
         while (false !== ($file = readdir($dir))) {
@@ -90,8 +88,7 @@ public static function tempname(TmpNamType $type = TmpNamType::PATH, string $pre
             return $tmpFilePath;
         }
 
-
-        if (false === unlink($tmpFilePath)) {
+        if (unlink($tmpFilePath) === false) {
             throw new \Exception('Could not remove temporary filepath ' . $tmpFilePath);
         }
 
@@ -99,8 +96,8 @@ public static function tempname(TmpNamType $type = TmpNamType::PATH, string $pre
             return $tmpFilePath;
         }
 
-        mkdir($tmpFilePath, 0777, true);
-        if (false === mkdir($tmpFilePath, 0777, true)) {
+        \mkdir($tmpFilePath, 0777, true);
+        if (\mkdir($tmpFilePath, 0777, true) === false) {
             throw new \Exception('Could not create temporary directory ' . $tmpFilePath);
         }
 
diff --git a/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php b/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
index b496185f..360322cd 100644
--- a/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/AggregateRepositoryTest.php
@@ -2,7 +2,6 @@
 
 namespace Test\Types\Harness\Repository;
 
-use Exception;
 use my127\Workspace\Types\Harness\Repository\AggregateRepository;
 use my127\Workspace\Types\Harness\Repository\HandlingRepository;
 use PHPUnit\Framework\TestCase;
@@ -44,7 +43,7 @@ public function itThrowsAnExceptionWhenNoRepositoryHandles()
 
         $sut = new AggregateRepository($repoNo);
 
-        $this->expectException(Exception::class);
+        $this->expectException(\Exception::class);
 
         $sut->get('foobar');
     }
diff --git a/tests/Test/Types/Harness/Repository/GitRepositoryTest.php b/tests/Test/Types/Harness/Repository/GitRepositoryTest.php
index 6694c565..196dd3ab 100644
--- a/tests/Test/Types/Harness/Repository/GitRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/GitRepositoryTest.php
@@ -17,7 +17,7 @@ public function itCreatesAPackageFromThePackageUrl()
         $this->assertEquals(new Package(['url' => 'git@github.com:inviqa/harness-base-php.git', 'ref' => '0.4.x', 'git' => true]), $got);
     }
 
-    /* @test **/
+    /* @test * */
     public function itHandlesOnlyGithubSshUrls()
     {
         $sut = new GithubRepository();
diff --git a/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php b/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
index 5df86e6b..810ff9fd 100644
--- a/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
+++ b/tests/Test/Types/Harness/Repository/LocalSyncRepositoryTest.php
@@ -2,7 +2,6 @@
 
 namespace Test\Types\Harness\Repository;
 
-use my127\Workspace\Types\Harness\Repository\ArchiveRepository;
 use my127\Workspace\Types\Harness\Repository\LocalSyncRepository;
 use my127\Workspace\Types\Harness\Repository\Package\Package;
 use PHPUnit\Framework\TestCase;
@@ -18,7 +17,7 @@ public function itCreatesAPackageFromThePackageUrl()
         $this->assertEquals(new Package(['url' => '/foo/bar/', 'localsync' => true]), $got);
     }
 
-    /* @test **/
+    /* @test * */
     public function itHandlesOnlySyncUrls()
     {
         $sut = new LocalSyncRepository();