Fix workflow runtime resolution for repository checkouts

Author: coisa

.github/actions/php/setup-composer/dev-tools-runtime-lib.sh

@@ -17,12 +17,21 @@ resolve_dev_tools_runtime() {
 
     DEV_TOOLS_WORKSPACE_ROOT="$(pwd)"
     DEV_TOOLS_SOURCE_DIRECTORY="$(resolve_dev_tools_workspace_path "${source_directory_input}")"
-    DEV_TOOLS_LOCAL_BINARY="${DEV_TOOLS_WORKSPACE_ROOT}/vendor/bin/dev-tools"
     DEV_TOOLS_LOCAL_AUTOLOAD="${DEV_TOOLS_WORKSPACE_ROOT}/vendor/autoload.php"
+    DEV_TOOLS_LOCAL_INSTALLED_BINARY="${DEV_TOOLS_WORKSPACE_ROOT}/vendor/bin/dev-tools"
+    DEV_TOOLS_LOCAL_REPOSITORY_BINARY="${DEV_TOOLS_WORKSPACE_ROOT}/bin/dev-tools"
 
-    if [ -x "${DEV_TOOLS_LOCAL_BINARY}" ] && [ -f "${DEV_TOOLS_LOCAL_AUTOLOAD}" ]; then
+    if [ -x "${DEV_TOOLS_LOCAL_INSTALLED_BINARY}" ] && [ -f "${DEV_TOOLS_LOCAL_AUTOLOAD}" ]; then
         DEV_TOOLS_RUNTIME_SOURCE='local'
-        DEV_TOOLS_RUNTIME_BINARY="${DEV_TOOLS_LOCAL_BINARY}"
+        DEV_TOOLS_RUNTIME_BINARY="${DEV_TOOLS_LOCAL_INSTALLED_BINARY}"
+        DEV_TOOLS_RUNTIME_AUTOLOAD="${DEV_TOOLS_LOCAL_AUTOLOAD}"
+
+        return 0
+    fi
+
+    if [ -x "${DEV_TOOLS_LOCAL_REPOSITORY_BINARY}" ] && [ -f "${DEV_TOOLS_LOCAL_AUTOLOAD}" ]; then
+        DEV_TOOLS_RUNTIME_SOURCE='local'
+        DEV_TOOLS_RUNTIME_BINARY="${DEV_TOOLS_LOCAL_REPOSITORY_BINARY}"
         DEV_TOOLS_RUNTIME_AUTOLOAD="${DEV_TOOLS_LOCAL_AUTOLOAD}"
 
         return 0
@@ -42,7 +51,7 @@ resolve_dev_tools_runtime() {
     fi
 
     DEV_TOOLS_RUNTIME_SOURCE='workflow'
-    DEV_TOOLS_RUNTIME_BINARY="${DEV_TOOLS_SOURCE_DIRECTORY}/vendor/bin/dev-tools"
+    DEV_TOOLS_RUNTIME_BINARY="${DEV_TOOLS_SOURCE_DIRECTORY}/bin/dev-tools"
     DEV_TOOLS_RUNTIME_AUTOLOAD="${DEV_TOOLS_SOURCE_DIRECTORY}/vendor/autoload.php"
 }
 

tests/GitHubActions/SetupComposerActionTest.php

@@ -86,7 +86,7 @@ protected function tearDown(): void
     #[Test]
     public function detectRuntimeWillPreferTheConsumerLocalInstallation(): void
     {
-        $this->createRuntimeFiles($this->workspace . '/vendor');
+        $this->createInstalledRuntimeFiles($this->workspace);
         $resolvedWorkspace = realpath($this->workspace);
 
         $files = $this->createGitHubActionFiles();
@@ -123,10 +123,33 @@ public function detectRuntimeWillFallbackToTheWorkflowSourceWhenTheConsumerDoesN
 
         self::assertSame('workflow', $outputs['source']);
         self::assertSame('true', $outputs['needs-fallback']);
-        self::assertSame($resolvedWorkspace . '/.dev-tools-actions/vendor/bin/dev-tools', $outputs['binary']);
+        self::assertSame($resolvedWorkspace . '/.dev-tools-actions/bin/dev-tools', $outputs['binary']);
         self::assertSame($resolvedWorkspace . '/.dev-tools-actions/vendor/autoload.php', $outputs['autoload']);
     }
 
+    /**
+     * @return void
+     */
+    #[Test]
+    public function detectRuntimeWillPreferTheWorkspaceRootRepositoryCheckout(): void
+    {
+        $this->createRepositoryRuntimeFiles($this->workspace);
+        $resolvedWorkspace = realpath($this->workspace);
+
+        $files = $this->createGitHubActionFiles();
+
+        $this->runActionScript('detect-dev-tools-runtime.sh', [
+            'GITHUB_OUTPUT' => $files['output'],
+        ]);
+
+        $outputs = $this->parseKeyValueFile($files['output']);
+
+        self::assertSame('local', $outputs['source']);
+        self::assertSame('false', $outputs['needs-fallback']);
+        self::assertSame($resolvedWorkspace . '/bin/dev-tools', $outputs['binary']);
+        self::assertSame($resolvedWorkspace . '/vendor/autoload.php', $outputs['autoload']);
+    }
+
     /**
      * @return void
      */
@@ -135,7 +158,7 @@ public function exposeRuntimeWillPublishWrapperAndEnvironmentVariablesForTheWork
     {
         mkdir($this->workspace . '/.dev-tools-actions', 0o777, true);
         file_put_contents($this->workspace . '/.dev-tools-actions/composer.json', "{}\n");
-        $this->createRuntimeFiles($this->workspace . '/.dev-tools-actions/vendor');
+        $this->createRepositoryRuntimeFiles($this->workspace . '/.dev-tools-actions');
         $resolvedWorkspace = realpath($this->workspace);
 
         $files = $this->createGitHubActionFiles();
@@ -154,7 +177,7 @@ public function exposeRuntimeWillPublishWrapperAndEnvironmentVariablesForTheWork
         $pathEntries = array_filter(explode("\n", trim(file_get_contents($files['path']))));
 
         self::assertSame('workflow', $outputs['source']);
-        self::assertSame($resolvedWorkspace . '/.dev-tools-actions/vendor/bin/dev-tools', $outputs['binary']);
+        self::assertSame($resolvedWorkspace . '/.dev-tools-actions/bin/dev-tools', $outputs['binary']);
         self::assertSame($resolvedWorkspace . '/.dev-tools-actions/vendor/autoload.php', $outputs['autoload']);
         self::assertSame($outputs['binary'], $environment['DEV_TOOLS_BINARY']);
         self::assertSame($outputs['autoload'], $environment['DEV_TOOLS_AUTOLOAD']);
@@ -170,19 +193,36 @@ public function exposeRuntimeWillPublishWrapperAndEnvironmentVariablesForTheWork
     }
 
     /**
-     * @param string $runtimeVendorDirectory
+     * @param string $runtimeRoot
+     *
+     * @return void
+     */
+    private function createInstalledRuntimeFiles(string $runtimeRoot): void
+    {
+        mkdir($runtimeRoot . '/vendor/bin', 0o777, true);
+        file_put_contents(
+            $runtimeRoot . '/vendor/bin/dev-tools',
+            "#!/usr/bin/env bash\nprintf 'dev-tools:%s\\n' \"\$*\"\n",
+        );
+        chmod($runtimeRoot . '/vendor/bin/dev-tools', 0o755);
+        file_put_contents($runtimeRoot . '/vendor/autoload.php', "<?php\n");
+    }
+
+    /**
+     * @param string $runtimeRoot
      *
      * @return void
      */
-    private function createRuntimeFiles(string $runtimeVendorDirectory): void
+    private function createRepositoryRuntimeFiles(string $runtimeRoot): void
     {
-        mkdir($runtimeVendorDirectory . '/bin', 0o777, true);
+        mkdir($runtimeRoot . '/bin', 0o777, true);
+        mkdir($runtimeRoot . '/vendor', 0o777, true);
         file_put_contents(
-            $runtimeVendorDirectory . '/bin/dev-tools',
+            $runtimeRoot . '/bin/dev-tools',
             "#!/usr/bin/env bash\nprintf 'dev-tools:%s\\n' \"\$*\"\n",
         );
-        chmod($runtimeVendorDirectory . '/bin/dev-tools', 0o755);
-        file_put_contents($runtimeVendorDirectory . '/autoload.php', "<?php\n");
+        chmod($runtimeRoot . '/bin/dev-tools', 0o755);
+        file_put_contents($runtimeRoot . '/vendor/autoload.php', "<?php\n");
     }
 
     /**