SDK-5690: Refactoring

spryker-sdk · Dec 14, 2023 · 0bd3e8b · 0bd3e8b
1 parent 1a4f2ea
commit 0bd3e8b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/src/IntegratorLock/IntegratorLockCleaner.php b/src/IntegratorLock/IntegratorLockCleaner.php
@@ -54,20 +54,24 @@ public function deleteLock(): void
     {
         $lockFilePath = $this->config->getIntegratorLockFilePath();
 
-        if ($this->isLockFileIgnoredByGit($lockFilePath) && !$this->filesystem->exists($lockFilePath)) {
+        if ($this->isLockFileIgnoredByGit($lockFilePath)) {
             return;
         }
+        $gitAddCommand = ['git', 'add'];
         if ($this->filesystem->exists($lockFilePath)) {
             $this->filesystem->remove($lockFilePath);
+            $gitAddCommand[] = $lockFilePath;
         }
         $gitignorePath = $this->config->getProjectRootDirectory() . static::GITIGNORE_FILE;
 
         if (!$this->filesystem->exists($gitignorePath) || strpos((string)file_get_contents($gitignorePath), $this->config::INTEGRATOR_LOCK) === false) {
             $this->filesystem->appendToFile($gitignorePath, PHP_EOL . $this->config::INTEGRATOR_LOCK . PHP_EOL);
+            $gitAddCommand[] = $gitignorePath;
+        }
+        if (count($gitAddCommand) > 2) {
+            $this->processExecutor->execute($gitAddCommand);
+            $this->processExecutor->execute(['git', 'commit', '-m', sprintf('Removed `%s` file.', $this->config::INTEGRATOR_LOCK), '-n']);
         }
-
-        $this->processExecutor->execute(['git', 'add', $lockFilePath, $gitignorePath]);
-        $this->processExecutor->execute(['git', 'commit', '-m', sprintf('Removed `%s` file.', $this->config::INTEGRATOR_LOCK), '-n']);
     }
 
     /**

diff --git a/tests/SprykerSdkTest/Integrator/IntegratorFacadeTest.php b/tests/SprykerSdkTest/Integrator/IntegratorFacadeTest.php
@@ -561,22 +561,4 @@ public function testRunUpdateLock(): void
 
         $this->assertNotEmpty(trim(file_get_contents($integratorLock)));
     }
-
-    /**
-     * @return void
-     */
-    public function testRunCleanLock(): void
-    {
-        // Arrange
-        $ioAdapter = $this->buildSymfonyConsoleInputOutputAdapter();
-
-        file_put_contents($this->getTestTmpDirPath() . '/integrator.lock', 'test');
-
-        // Act
-        $this->createIntegratorFacade()->runCleanLock($ioAdapter);
-
-        // Assert
-        $integratorLock = $this->getTestTmpDirPath() . '/integrator.lock';
-        $this->assertFileDoesNotExist($integratorLock);
-    }
 }