chore: guess package not found error

flarum · Dec 8, 2023 · 5b1ddf4 · 5b1ddf4
1 parent 323cc1a
commit 5b1ddf4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/extensions/package-manager/locale/en.yml b/extensions/package-manager/locale/en.yml
@@ -18,6 +18,7 @@ flarum-package-manager:
 
       guessed_cause:
         extension_incompatible_with_instance: The extension is most likely incompatible with your current Flarum instance.
+        extension_not_found: The extension was not found or does not exist.
         extensions_incompatible_with_new_major: >
           Some installed extensions are not compatible with the newest major release.
           Please wait until the extensions are updated to be compatible by the authors, or remove them before proceeding.

diff --git a/extensions/package-manager/src/Exception/ComposerRequireFailedException.php b/extensions/package-manager/src/Exception/ComposerRequireFailedException.php
@@ -11,20 +11,31 @@
 
 class ComposerRequireFailedException extends ComposerCommandFailedException
 {
-    protected const INCOMPATIBLE_REGEX = '/(?:(?: +- {PACKAGE_NAME}(?: v[0-9A-z.-]+ requires|\[[^\[\]]+\] require) flarum\/core)|(?:Could not find a version of package {PACKAGE_NAME} matching your minim)|(?: +- Root composer.json requires {PACKAGE_NAME} [^,]+, found {PACKAGE_NAME}\[[^\[\]]+\]+ but it does not match your minimum-stability))/m';
+    protected const INCOMPATIBLE_REGEX  = '/(?:(?: +- {PACKAGE_NAME}(?: v[0-9A-z.-]+ requires|\[[^\[\]]+\] require) flarum\/core)|(?:Could not find a version of package {PACKAGE_NAME} matching your minim)|(?: +- Root composer\.json requires {PACKAGE_NAME} [^,]+, found {PACKAGE_NAME}\[[^\[\]]+\]+ but it does not match your minimum-stability))/m';
+    protected const NOT_FOUND_REGEX     = '/(?:(?: +- Root composer\.json requires {PACKAGE_NAME}, it could not be found in any version, there may be a typo in the package name.))/m';
 
     public function guessCause(): ?string
     {
-        $hasMatches = preg_match(
+        $hasIncompatibleMatches = preg_match(
             str_replace('{PACKAGE_NAME}', preg_quote($this->getRawPackageName(), '/'), self::INCOMPATIBLE_REGEX),
             $this->getMessage(),
             $matches
         );
 
-        if ($hasMatches) {
+        if ($hasIncompatibleMatches) {
             return 'extension_incompatible_with_instance';
         }
 
+        $hasNotFoundMatches = preg_match(
+            str_replace('{PACKAGE_NAME}', preg_quote($this->getRawPackageName(), '/'), self::NOT_FOUND_REGEX),
+            $this->getMessage(),
+            $matches
+        );
+
+        if ($hasNotFoundMatches) {
+            return 'extension_not_found';
+        }
+
         return null;
     }
 }