chore: fix misc cs-fixer issues

GoogleCloudPlatform · Oct 3, 2024 · 2b4efc5 · 2b4efc5
1 parent 3c3fb00
commit 2b4efc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/code-standards.yml b/.github/workflows/code-standards.yml
@@ -88,7 +88,7 @@ jobs:
                  "from the root of your ${{ github.repository }} repo:"
             echo ""
             echo "    composer global require google/cloud-tools"
-            echo "    ~/.composer/vendor/bin/php-tools cs-fixer ${{ github.repository }} --ref ${{ github.ref_name }}"
+            echo "    ~/.composer/vendor/bin/php-tools cs-fixer ${{ github.repository }} --ref ${{ github.head_ref || github.ref_name }}"
             echo ""
             exit 1
           fi
diff --git a/src/Utils/Actions/RunCsFixerCommand.php b/src/Utils/Actions/RunCsFixerCommand.php
@@ -106,7 +106,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($defaultWorkflow['on']['workflow_call']['inputs'] as $name => $inputOptions) {
             $defaults[$name] = $inputOptions['default'] ?? '';
         }
-        $options = array_merge($defaults, $job['with']);
+        $options = array_merge($defaults, $job['with'] ?? []);
 
         if (str_starts_with($options['config'], 'GoogleCloudPlatform/php-tools/')) {
             // use local file