Skip to content

Commit b6ede55

Browse files
committed
chore(composer-updater): update composer packages and add git hooks
- Update composer packages - Add git hooks - Reload installed versions
1 parent 7c73622 commit b6ede55

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

composer-updater

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ $status = (new SingleCommandApplication)
8686
public function __invoke(): void
8787
{
8888
$this
89+
->updateComposerPackages()
90+
->updateOutdatedComposerPackages()
8991
->updateComposerPackages()
9092
->updateOutdatedComposerPackages()
9193
->updateComposerPackages()
@@ -135,6 +137,7 @@ $status = (new SingleCommandApplication)
135137
{
136138
$outdatedComposerPackages = $this->getOutdatedComposerPackages();
137139
$decodedComposerJson = json_decode(file_get_contents($this->composerJsonPath), true);
140+
(fn () => self::reload(null))->call(new InstalledVersions);
138141

139142
foreach ($decodedComposerJson as $name => &$value) {
140143
if (! in_array($name, ['require', 'require-dev'], true)) {
@@ -149,18 +152,13 @@ $status = (new SingleCommandApplication)
149152
continue;
150153
}
151154

152-
if (isset($outdatedComposerPackages[$package])) { // 多版本依赖
153-
$dependencyVersion = $outdatedComposerPackages[$package]['dependency_version'];
154-
} else { // 单版本依赖
155-
if (
156-
$this->strIs('*|*', $dependencyVersion)
157-
|| ! ($version = InstalledVersions::getVersion($package))
158-
) {
159-
continue;
160-
}
161-
155+
if ($version = InstalledVersions::getVersion($package)) {
162156
$dependencyVersion = $this->toDependencyVersion($version);
163157
}
158+
159+
if (isset($outdatedComposerPackages[$package])) {
160+
$dependencyVersion = $outdatedComposerPackages[$package]['dependency_version'];
161+
}
164162
}
165163
}
166164

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"illuminate/support": "^7.0 || ^8.0 || ^9.0 || ^10.0"
6868
},
6969
"require-dev": {
70-
"brainmaestro/composer-git-hooks": "^2.8 || ^3.0",
70+
"brainmaestro/composer-git-hooks": "^2.8",
7171
"ergebnis/composer-normalize": "^2.42",
7272
"friendsofphp/php-cs-fixer": "^3.48",
7373
"guanguans/ai-commit": "dev-main",

0 commit comments

Comments
 (0)