Issue #3350909 by tedbow: Core merge request conversion now incorrectly fails on phpstan

composer.json

@@ -25,13 +25,15 @@
             "Composer\\Config::disableProcessTimeout",
             "scripts/phpunit.sh"
         ],
-        "core-convert": "Drupal\\automatic_updates\\Development\\Converter::doConvert"
+        "core-convert": "Drupal\\automatic_updates\\Development\\Converter::doConvert",
+        "core-commit": "Drupal\\automatic_updates\\Development\\Converter::makeCommit"
     },
     "scripts-descriptions": {
         "phpcbf": "Automatically fixes standards violations where possible.",
         "phpcs": "Checks code for standards compliance.",
         "test": "Runs PHPUnit tests.",
-        "core-convert": "Converts this module to a core merge request. Excepts 2 arguments. 1) The core clone directory. 2) The core merge request branch."
+        "core-convert": "Converts this module to a core merge request. Excepts 2 arguments. 1) The core clone directory. 2) The core merge request branch.",
+        "core-commit": "Converts this module to a core merge request. Excepts 1 arguments. The core clone directory."
     },
     "autoload": {
         "psr-4": {

scripts/src/Converter.php

@@ -141,7 +141,7 @@ class Converter {
     else {
       self::info('⚠️Skipped core checks');
     }
-    static::makeCommit($core_dir);
+    static::doMakeCommit($core_dir);
     self::info('Make commit');
     self::info("Done. Probably good but you should check before you push. These are the files present in the contrib module absent in core:");
     print shell_exec(sprintf("tree %s/package_manager > /tmp/contrib.txt  && tree %s/core/modules/package_manager > /tmp/core.txt && diff /tmp/contrib.txt /tmp/core.txt", self::getContribDir(), $core_dir));
@@ -322,13 +322,32 @@ class Converter {
     }
   }
 
+  /**
+   * Makes the commit to the merge request.
+   *
+   * Should only be used if core code checks fail for a known reason that can
+   * be ignored.
+   *
+   * @param \Composer\Script\Event $event
+   *   The Composer event.
+   */
+  public static function makeCommit(Event $event): void {
+    $args = $event->getArguments();
+    $count_arg = count($args);
+    if ($count_arg !== 1) {
+      throw new \Exception("This scripts 1 required arguments: a directory that is a core clone");
+    }
+    $core_dir = $args[0];
+    static::doMakeCommit($core_dir);
+  }
+
   /**
    * Makes commit in the root of Drupal Core.
    *
    * @param string $core_dir
    *   The path to the root of Drupal Core.
    */
-  private static function makeCommit(string $core_dir): void {
+  private static function doMakeCommit(string $core_dir): void {
     chdir(self::getContribDir());
     self::ensureGitClean();
     $hash = trim(shell_exec('git rev-parse HEAD'));