Merge pull request #790 from nextcloud/stable19-fix-3rdparty

[stable19] Hardcode 19 dependencies

.github/workflows/composer.yml

@@ -19,12 +19,12 @@ 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
     - name: Vendor dependencies
       run: composer run vendor
     - name: Check vendor changes
       run: |
-        bash -c "[[ ! \"`git status --porcelain `\" ]] || ( echo 'Uncommited vendor changes' && git status && git diff && exit 1 )"
+        bash -c "[[ ! \"`git status --porcelain . :!composer/installed.json :!composer/installed.php :!composer/package-versions-deprecated/src/PackageVersions/Versions.php `\" ]] || ( echo 'Uncommited vendor changes' && git status && git diff && exit 1 )"
+

composer.json

@@ -45,7 +45,16 @@
 		"symfony/routing": "4.4.4",
 		"symfony/translation": "4.4.4",
 		"php-http/guzzle6-adapter": "^2.0",
-		"web-auth/webauthn-lib": "^3.1"
+		"web-auth/webauthn-lib": "^3.1",
+		"doctrine/annotations": "1.6.0",
+		"doctrine/collections": "1.5.0",
+		"doctrine/common": "2.10.0",
+		"doctrine/inflector": "1.3.0",
+		"doctrine/persistence": "1.1.0",
+		"doctrine/reflection": "1.0.0",
+		"guzzlehttp/ringphp": "1.1.0",
+		"guzzlehttp/streams": "3.0.0",
+		"react/promise": "2.2.1"
 	},
 	"scripts": {
 		"vendor": "composer install --no-dev && git clean -xdf && composer dump-autoload"

composer/ClassLoader.php

@@ -37,11 +37,13 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
+ * @see    https://www.php-fig.org/psr/psr-0/
+ * @see    https://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
+    private $vendorDir;
+
     // PSR-4
     private $prefixLengthsPsr4 = array();
     private $prefixDirsPsr4 = array();
@@ -57,6 +59,13 @@ class ClassLoader
     private $missingClasses = array();
     private $apcuPrefix;
 
+    private static $registeredLoaders = array();
+
+    public function __construct($vendorDir = null)
+    {
+        $this->vendorDir = $vendorDir;
+    }
+
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -300,6 +309,17 @@ public function getApcuPrefix()
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            return;
+        }
+
+        if ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
@@ -308,13 +328,17 @@ public function register($prepend = false)
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
@@ -323,6 +347,8 @@ public function loadClass($class)
 
             return true;
         }
+
+        return null;
     }
 
     /**
@@ -367,6 +393,16 @@ public function findFile($class)
         return $file;
     }
 
+    /**
+     * Returns the currently registered loaders indexed by their corresponding vendor directories.
+     *
+     * @return self[]
+     */
+    public static function getRegisteredLoaders()
+    {
+        return self::$registeredLoaders;
+    }
+
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup