@@ -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
0 commit comments