Fixed duplicating empty lines after install. (#1693)

AlexSkrypnyk · web-flow · commit a6f2d012b75d · 2025-06-01T18:15:53.000+10:00
diff --git a/.vortex/installer/composer.lock b/.vortex/installer/composer.lock
diff --git a/.vortex/installer/src/Prompts/Handlers/Internal.php b/.vortex/installer/src/Prompts/Handlers/Internal.php
@@ -49,7 +49,7 @@ public function process(): void {
       ];
       $relative_path = str_replace($t, '', $file->getPathname());
       if (!in_array($relative_path, $ignore_empty_line_processing)) {
-        $content = File::replaceContent($content, '/(\n\s*\n)+/', "\n\n");
+        $content = File::collapseRepeatedEmptyLines($content);
       }
 
       return $content;
diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.dockerignore b/.vortex/installer/tests/Fixtures/install/_baseline/.dockerignore
@@ -46,4 +46,3 @@ drush/contrib/
 !rector.php
 !scripts
 !tests
-
diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/.env b/.vortex/installer/tests/Fixtures/install/_baseline/.env
@@ -180,4 +180,3 @@ VORTEX_NOTIFY_EMAIL_RECIPIENTS="webmaster@star-wars-domain.example"
 
 # URL of the database used for demonstration with URL database download type.
 VORTEX_DB_DOWNLOAD_URL=https://github.com/drevops/vortex/releases/download/25.4.0/db_d11.demo.sql
-
diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/docs/ci.md b/.vortex/installer/tests/Fixtures/install/_baseline/docs/ci.md
@@ -27,4 +27,3 @@ support.
 
 Use "Run workflow" button in GitHub Actions UI to start build with SSH support
 that will be available for 120 minutes after the build is finished.
-
diff --git a/.vortex/installer/tests/Fixtures/install/_baseline/docs/deployment.md b/.vortex/installer/tests/Fixtures/install/_baseline/docs/deployment.md
@@ -16,4 +16,3 @@ Refer to https://vortex.drevops.com/workflows/deployment for more information.
    deployment.
 
 Once PR is closed, the environment will be automatically removed.
-
diff --git a/.vortex/installer/tests/Fixtures/install/deploy_type_all_circleci/.gitignore.artifact b/.vortex/installer/tests/Fixtures/install/deploy_type_all_circleci/.gitignore.artifact
@@ -30,4 +30,3 @@ web/themes/custom/star_wars/package.json
 web/themes/custom/star_wars/yarn.lock
 web/themes/custom/star_wars/.eslintrc.json
 web/themes/custom/star_wars/node_modules
-
diff --git a/.vortex/installer/tests/Fixtures/install/deploy_type_all_circleci/docs/ci.md b/.vortex/installer/tests/Fixtures/install/deploy_type_all_circleci/docs/ci.md
@@ -16,7 +16,7 @@
  
  Refer to https://vortex.drevops.com/latest/usage/ci for more information.
  
-@@ -21,10 +21,7 @@
+@@ -21,9 +21,6 @@
  
  ### SSH
  
@@ -29,4 +29,3 @@
 +Circle CI supports shell access to the build for 120 minutes after the build is
 +finished when the build is started with SSH support. Use "Rerun job with SSH"
 +button in Circle CI UI to start build with SSH support.
- 
diff --git a/.vortex/installer/tests/Fixtures/install/deploy_type_all_gha/.gitignore.artifact b/.vortex/installer/tests/Fixtures/install/deploy_type_all_gha/.gitignore.artifact
@@ -30,4 +30,3 @@ web/themes/custom/star_wars/package.json
 web/themes/custom/star_wars/yarn.lock
 web/themes/custom/star_wars/.eslintrc.json
 web/themes/custom/star_wars/node_modules
-
diff --git a/.vortex/installer/tests/Fixtures/install/deploy_type_artifact/.gitignore.artifact b/.vortex/installer/tests/Fixtures/install/deploy_type_artifact/.gitignore.artifact
@@ -30,4 +30,3 @@ web/themes/custom/star_wars/package.json
 web/themes/custom/star_wars/yarn.lock
 web/themes/custom/star_wars/.eslintrc.json
 web/themes/custom/star_wars/node_modules
-
diff --git a/.vortex/installer/tests/Fixtures/install/deploy_type_none_gha/.github/workflows/build-test-deploy.yml b/.vortex/installer/tests/Fixtures/install/deploy_type_none_gha/.github/workflows/build-test-deploy.yml
@@ -1,7 +1,8 @@
-@@ -339,60 +339,3 @@
+@@ -338,61 +338,3 @@
+         timeout-minutes: 120 # Cancel the action after 15 minutes, regardless of whether a connection has been established.
          with:
            detached: true
- 
+-
 -  deploy:
 -    runs-on: ubuntu-latest
 -    needs: build
diff --git a/.vortex/installer/tests/Fixtures/install/hosting_acquia/.dockerignore b/.vortex/installer/tests/Fixtures/install/hosting_acquia/.dockerignore
@@ -22,8 +22,9 @@
  !drush
  drush/contrib/
  
-@@ -47,3 +47,4 @@
+@@ -46,3 +46,5 @@
+ !rector.php
  !scripts
  !tests
- 
++
 +!hooks
diff --git a/.vortex/installer/tests/Fixtures/install/hosting_acquia/docs/deployment.md b/.vortex/installer/tests/Fixtures/install/hosting_acquia/docs/deployment.md
@@ -1,7 +1,8 @@
-@@ -17,3 +17,83 @@
+@@ -16,3 +16,83 @@
+    deployment.
  
  Once PR is closed, the environment will be automatically removed.
- 
++
 +GitHub is a primary code repository for this project (aka "source repository").
 +Acquia Cloud is a hosting provider for this project and it also has a git
 +repository (aka "destination repository").
@@ -81,4 +82,3 @@
 +3. There may be `main` or `develop` branch in Acquia Cloud repository.
 +4. Technical Lead is expected to regularly cleanup `feature/*` and `bugfix/*`
 +   branches in Acquia Cloud repository.
-+
diff --git a/.vortex/installer/tests/Fixtures/install/hosting_lagoon/.dockerignore b/.vortex/installer/tests/Fixtures/install/hosting_lagoon/.dockerignore
@@ -1,5 +1,6 @@
-@@ -47,3 +47,4 @@
+@@ -46,3 +46,5 @@
+ !rector.php
  !scripts
  !tests
- 
++
 +!.lagoon.env.*
diff --git a/.vortex/installer/tests/Fixtures/install/hosting_lagoon/docs/deployment.md b/.vortex/installer/tests/Fixtures/install/hosting_lagoon/docs/deployment.md
@@ -1,7 +1,8 @@
-@@ -17,3 +17,12 @@
+@@ -16,3 +16,12 @@
+    deployment.
  
  Once PR is closed, the environment will be automatically removed.
- 
++
 +## Database refresh in Lagoon environments
 +
 +To fresh the database in the existing Lagoon environment with the database from
@@ -10,4 +11,3 @@
 +```bash
 +VORTEX_DEPLOY_BRANCH=<YOUR/BRANCH-NAME> VORTEX_DEPLOY_ACTION=deploy_override_db ahoy deploy
 +```
-+
diff --git a/.vortex/installer/tests/Fixtures/install/theme_absent/web/modules/custom/sw_base/sw_base.deploy.php b/.vortex/installer/tests/Fixtures/install/theme_absent/web/modules/custom/sw_base/sw_base.deploy.php
@@ -1,7 +1,8 @@
-@@ -9,13 +9,3 @@
+@@ -8,14 +8,3 @@
+  */
  
  declare(strict_types=1);
- 
+-
 -/**
 - * Installs custom theme.
 - *

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function process(): void {`
`49`	`49`	`];`
`50`	`50`	`$relative_path = str_replace($t, '', $file->getPathname());`
`51`	`51`	`if (!in_array($relative_path, $ignore_empty_line_processing)) {`
`52`		`- $content = File::replaceContent($content, '/(\n\s*\n)+/', "\n\n");`
	`52`	`+ $content = File::collapseRepeatedEmptyLines($content);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`return $content;`
Original file line number	Diff line number	Diff line change
`@@ -180,4 +180,3 @@ VORTEX_NOTIFY_EMAIL_RECIPIENTS="webmaster@star-wars-domain.example"`
`180`	`180`
`181`	`181`	`# URL of the database used for demonstration with URL database download type.`
`182`	`182`	`VORTEX_DB_DOWNLOAD_URL=https://github.com/drevops/vortex/releases/download/25.4.0/db_d11.demo.sql`
`183`		`-`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,3 @@ support.`
`27`	`27`
`28`	`28`	`Use "Run workflow" button in GitHub Actions UI to start build with SSH support`
`29`	`29`	`that will be available for 120 minutes after the build is finished.`
`30`		`-`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,3 @@ Refer to https://vortex.drevops.com/workflows/deployment for more information.`
`16`	`16`	`deployment.`
`17`	`17`
`18`	`18`	`Once PR is closed, the environment will be automatically removed.`
`19`		`-`