Merge "registration: Fix caching of load_composer_autoloader"

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index ce262bd..ffc7a7e 100644 (file)
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -520,10 +520,7 @@ class ExtensionProcessor implements Processor {
        public function getExtraAutoloaderPaths( $dir, array $info ) {
                $paths = [];
                if ( isset( $info['load_composer_autoloader'] ) && $info['load_composer_autoloader'] === true ) {
-                       $path = "$dir/vendor/autoload.php";
-                       if ( file_exists( $path ) ) {
-                               $paths[] = $path;
-                       }
+                       $paths[] = "$dir/vendor/autoload.php";
                }
                return $paths;
        }

diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index bf33c6c..740fed4 100644 (file)
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -319,7 +319,9 @@ class ExtensionRegistry {
                        define( $name, $val );
                }
                foreach ( $info['autoloaderPaths'] as $path ) {
-                       require_once $path;
+                       if ( file_exists( $path ) ) {
+                               require_once $path;
+                       }
                }
 
                $this->loaded += $info['credits'];