Merge pull request #616 from nextcloud/enhancement/psr-event-dispatcher

Add the psr/event-dispatcher package

.gitignore

@@ -2,6 +2,8 @@
 bin
 */**/phpstan.neon
 .php_cs.dist
+# ignore editor config
+**/*.editorconfig
 # ignore demo files
 **/.travis.yml
 # ignore .github files

composer.json

@@ -29,14 +29,17 @@
 		"microsoft/azure-storage-blob": "^1.5",
 		"nextcloud/lognormalizer": "^1.0",
 		"nikic/php-parser": "^4.2",
+		"opis/closure": "^3.6",
 		"patchwork/jsqueeze": "^2.0",
 		"pear/archive_tar": "^1.4.9",
 		"pear/pear-core-minimal": "^v1.10",
-		"phpseclib/phpseclib": "2.0.30",
+		"php-ds/php-ds": "^1.3",
 		"php-http/guzzle7-adapter": "^0.1.1",
 		"php-opencloud/openstack": "^3.1",
+		"phpseclib/phpseclib": "2.0.30",
 		"pimple/pimple": "3.3.1",
 		"psr/container": "^1.0",
+		"psr/event-dispatcher": "^1.0",
 		"punic/punic": "^1.6",
 		"sabre/dav": "^4.1.3",
 		"scssphp/scssphp": "^1.4.0",
@@ -45,14 +48,12 @@
 		"symfony/console": "4.4.19",
 		"symfony/event-dispatcher": "4.4.19",
 		"symfony/event-dispatcher-contracts": "1.1.9",
-		"symfony/polyfill-intl-normalizer": "^1.20",
 		"symfony/polyfill-intl-grapheme": "^1.20",
+		"symfony/polyfill-intl-normalizer": "^1.20",
 		"symfony/process": "4.4.19",
 		"symfony/routing": "4.4.19",
 		"symfony/translation": "4.4.19",
-		"web-auth/webauthn-lib": "^3.1",
-		"php-ds/php-ds": "^1.3",
-		"opis/closure": "^3.6"
+		"web-auth/webauthn-lib": "^3.1"
 	},
 	"scripts": {
 		"vendor": "composer install --no-dev && git clean -xdf && composer dump-autoload"

composer/ClassLoader.php

@@ -42,6 +42,8 @@
  */
 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,15 @@ public function getApcuPrefix()
     public function register($prepend = false)
     {
         spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+
+        if (null === $this->vendorDir) {
+            //no-op
+        } elseif ($prepend) {
+            self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders;
+        } else {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+            self::$registeredLoaders[$this->vendorDir] = $this;
+        }
     }
 
     /**
@@ -308,6 +326,10 @@ public function register($prepend = false)
     public function unregister()
     {
         spl_autoload_unregister(array($this, 'loadClass'));
+
+        if (null !== $this->vendorDir) {
+            unset(self::$registeredLoaders[$this->vendorDir]);
+        }
     }
 
     /**
@@ -367,6 +389,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