Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:

level: 7

phpVersion: 80328
phpVersion: __VERSION__

paths:
- web/modules/custom
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@@ -14,10 +14,10 @@
phpVersion: 80328
phpVersion: __VERSION__

paths:
- - web/modules/custom
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@@ -14,10 +14,10 @@
phpVersion: 80328
phpVersion: __VERSION__

paths:
- - web/modules/custom
Expand Down
3 changes: 3 additions & 0 deletions .vortex/installer/tests/Functional/FunctionalTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use DrevOps\VortexInstaller\Tests\Unit\UnitTestCase;
use DrevOps\VortexInstaller\Utils\Config;
use DrevOps\VortexInstaller\Utils\Env;
use AlexSkrypnyk\File\Replacer\Replacement;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial

Import ordering inconsistency.

The new import AlexSkrypnyk\File\Replacer\Replacement is placed after DrevOps\VortexInstaller\Utils\Env but should be grouped with other AlexSkrypnyk imports at the top (lines 7-8) for consistency.

♻️ Suggested import ordering
 use AlexSkrypnyk\PhpunitHelpers\Traits\ApplicationTrait;
 use AlexSkrypnyk\PhpunitHelpers\Traits\TuiTrait as UpstreamTuiTrait;
+use AlexSkrypnyk\File\Replacer\Replacement;
 use DrevOps\VortexInstaller\Command\InstallCommand;
 use DrevOps\VortexInstaller\Tests\Traits\TuiTrait;
 use DrevOps\VortexInstaller\Tests\Unit\UnitTestCase;
 use DrevOps\VortexInstaller\Utils\Config;
 use DrevOps\VortexInstaller\Utils\Env;
-use AlexSkrypnyk\File\Replacer\Replacement;
 use DrevOps\VortexInstaller\Utils\File;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
use AlexSkrypnyk\File\Replacer\Replacement;
use AlexSkrypnyk\PhpunitHelpers\Traits\ApplicationTrait;
use AlexSkrypnyk\PhpunitHelpers\Traits\TuiTrait as UpstreamTuiTrait;
use AlexSkrypnyk\File\Replacer\Replacement;
use DrevOps\VortexInstaller\Command\InstallCommand;
use DrevOps\VortexInstaller\Tests\Traits\TuiTrait;
use DrevOps\VortexInstaller\Tests\Unit\UnitTestCase;
use DrevOps\VortexInstaller\Utils\Config;
use DrevOps\VortexInstaller\Utils\Env;
use DrevOps\VortexInstaller\Utils\File;
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In @.vortex/installer/tests/Functional/FunctionalTestCase.php at line 14, Move
the import of AlexSkrypnyk\File\Replacer\Replacement so it is grouped with the
other AlexSkrypnyk imports at the top of the file rather than placed after
DrevOps\VortexInstaller\Utils\Env; locate the use statement for Replacement and
relocate it into the existing AlexSkrypnyk block (near any other AlexSkrypnyk
use lines) to maintain consistent import ordering.

use DrevOps\VortexInstaller\Utils\File;
use DrevOps\VortexInstaller\Utils\Strings;

Expand Down Expand Up @@ -117,6 +118,8 @@ protected function assertSutNotContains(string|array $needles): void {
protected function replaceVersions(string $dir): void {
File::getReplacer()
->addVersionReplacements()
// PHPStan phpVersion is an integer (e.g., 80330), not semver.
->addReplacement(Replacement::create('phpstan_version', '/(phpVersion:\s)\d{5,6}/', '${1}' . Replacement::VERSION))
->addExclusions(['127.0.0.1'])
// Increase max replacements to handle large files with many version
// strings (GHA workflows, lock files, etc). This value was empirically
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@
"dealerdirect/phpcodesniffer-composer-installer": "^1.2.0",
"drevops/behat-format-progress-fail": "^1.4",
"drevops/behat-screenshot": "^2.2",
"drevops/behat-steps": "^3.5.0",
"drevops/behat-steps": "^3.5.2",
"drevops/phpcs-standard": "^0.6.2",
"drupal/coder": "^9@alpha",
"drupal/drupal-extension": "^5.1",
"drupal/drupal-extension": "^5.2.1",
"ergebnis/composer-normalize": "^2.50.0",
"lullabot/mink-selenium2-driver": "^1.7.4",
"lullabot/php-webdriver": "^2.0.7",
"mglaman/phpstan-drupal": "^2.0.10",
"mglaman/phpstan-drupal": "^2.0.11",
"mikey179/vfsstream": "^1.6.12",
"palantirnet/drupal-rector": "^0.21.1",
"phpcompatibility/php-compatibility": "^10.0@alpha",
"phpmd/phpmd": "^2.15",
"phpspec/prophecy-phpunit": "^2.5",
"phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan": "^2.1.39",
"phpstan/phpstan": "^2.1.40",
"phpunit/phpunit": "^11.5.55",
"pyrech/composer-changelogs": "^2.2",
"rector/rector": "^2.3.7",
"vincentlanglet/twig-cs-fixer": "^3.13"
"rector/rector": "^2.3.8",
"vincentlanglet/twig-cs-fixer": "^3.14"
},
"conflict": {
"drupal/drupal": "*"
Expand Down Expand Up @@ -98,7 +98,7 @@
"bump-after-update": true,
"discard-changes": true,
"platform": {
"php": "8.3.28"
"php": "8.3.30"
},
"sort-packages": true
},
Expand Down
2 changes: 1 addition & 1 deletion phpstan.neon
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:

level: 7

phpVersion: 80328
phpVersion: 80330

paths:
- web/modules/custom
Expand Down
Loading
Loading