Use composer v1 on CI

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
nextcloud · Nov 23, 2020 · 149ada8 · 149ada8
1 parent b6bf961
commit 149ada8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/composer.yml b/.github/workflows/composer.yml
@@ -19,6 +19,7 @@ jobs:
       uses: shivammathur/setup-php@master
       with:
         php-version: 7.4
+        tools: composer:v1
         coverage: none
     - name: Update composer
       run: sudo composer self-update && composer --version

diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();