Merge pull request #91 from php-tuf/dependabot/composer/all-fec34ab360

Bump the all group with 9 updates
php-tuf · Apr 15, 2024 · fd07a10 · fd07a10
2 parents e222f30 + c15f404
commit fd07a10
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 140 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -50,9 +50,8 @@ jobs:
                 os: [ ubuntu-latest, macos-latest, windows-latest ]
                 php: [ "8.1" ]
         steps:
-            -   name: "Debugging info"
-                run: "rsync --version | head -1"
-                if: ${{ matrix.os != 'windows-latest' }}
+            -   name: "Install rsync"
+                uses: GuillaumeFalourd/[email protected] # https://github.com/marketplace/actions/setup-rsync
 
             -   name: "Set up PHP"
                 uses: shivammathur/setup-php@v2 # https://github.com/marketplace/actions/setup-php-action

diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
diff --git a/composer.lock b/composer.lock
diff --git a/config/services.yml b/config/services.yml
@@ -19,14 +19,5 @@ services:
             - '../vendor/php-tuf/composer-stager/src/*/*/Value'
             - '../vendor/php-tuf/composer-stager/src/API/Exception'
 
-    PhpTuf\ComposerStager\API\FileSyncer\Service\FileSyncerInterface:
-        factory: [ '@PhpTuf\ComposerStager\Internal\FileSyncer\Factory\FileSyncerFactory', 'create' ]
-    PhpTuf\ComposerStager\Internal\FileSyncer\Factory\FileSyncerFactory:
-        arguments:
-            $phpFileSyncer: '@PhpTuf\ComposerStager\Internal\FileSyncer\Service\PhpFileSyncer'
-            $rsyncFileSyncer: '@PhpTuf\ComposerStager\Internal\FileSyncer\Service\RsyncFileSyncer'
-    PhpTuf\ComposerStager\Internal\FileSyncer\Service\PhpFileSyncer: ~
-    PhpTuf\ComposerStager\Internal\FileSyncer\Service\RsyncFileSyncer: ~
-
     Symfony\Component\Filesystem\Filesystem: ~
     Symfony\Component\Process\ExecutableFinder: ~
diff --git a/tests/PHPUnit/Console/Command/BeginCommandUnitTest.php b/tests/PHPUnit/Console/Command/BeginCommandUnitTest.php
@@ -5,7 +5,6 @@
 use PhpTuf\ComposerStager\API\Core\BeginnerInterface;
 use PhpTuf\ComposerStager\API\Exception\InvalidArgumentException;
 use PhpTuf\ComposerStager\API\Exception\RuntimeException;
-use PhpTuf\ComposerStager\API\Path\Factory\PathFactoryInterface;
 use PhpTuf\ComposerStager\Internal\Path\Factory\PathFactory;
 use PhpTuf\ComposerStagerConsole\Console\Application;
 use PhpTuf\ComposerStagerConsole\Console\Command\AbstractCommand;
@@ -36,15 +35,14 @@ protected function setUp(): void
         $this->beginner = $this->prophesize(BeginnerInterface::class);
         $this->beginner
             ->begin(Argument::cetera());
-        $this->pathFactory = $this->prophesize(PathFactoryInterface::class);
 
         parent::setUp();
     }
 
     protected function createSut(): Command
     {
         $beginner = $this->beginner->reveal();
-        $pathFactory = new PathFactory();
+        $pathFactory = $this->container()->get(PathFactory::class);
 
         return new BeginCommand($beginner, $pathFactory);
     }

diff --git a/tests/PHPUnit/Console/Command/CleanCommandUnitTest.php b/tests/PHPUnit/Console/Command/CleanCommandUnitTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
     protected function createSut(): Command
     {
         $cleaner = $this->cleaner->reveal();
-        $pathFactory = new PathFactory();
+        $pathFactory = $this->container()->get(PathFactory::class);
 
         return new CleanCommand($cleaner, $pathFactory);
     }

diff --git a/tests/PHPUnit/Console/Command/CommitCommandUnitTest.php b/tests/PHPUnit/Console/Command/CommitCommandUnitTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
     protected function createSut(): Command
     {
         $committer = $this->committer->reveal();
-        $pathFactory = new PathFactory();
+        $pathFactory = $this->container()->get(PathFactory::class);
 
         return new CommitCommand($committer, $pathFactory);
     }

diff --git a/tests/PHPUnit/Console/Command/StageCommandUnitTest.php b/tests/PHPUnit/Console/Command/StageCommandUnitTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
 
     protected function createSut(): Command
     {
-        $pathFactory = new PathFactory();
+        $pathFactory = $this->container()->get(PathFactory::class);
         $stager = $this->stager->reveal();
 
         return new StageCommand($pathFactory, $stager);