Merge remote-tracking branch 'origin/master'

libraries/common.inc.php

@@ -75,14 +75,14 @@ require_once './libraries/vendor_config.php';
 /**
  * Activate autoloader
  */
-if (! @is_readable('./vendor/autoload.php')) {
+if (! @is_readable(AUTOLOAD_FILE)) {
     die(
-        'File <tt>./vendor/autoload.php</tt> missing or not readable. <br />'
+        'File <tt>' . AUTOLOAD_FILE . '</tt> missing or not readable. <br />'
         . 'Most likely you did not run Composer to '
         . '<a href="https://docs.phpmyadmin.net/en/latest/setup.html#installing-from-git">install library files</a>.'
     );
 }
-require_once './vendor/autoload.php';
+require_once AUTOLOAD_FILE;
 
 /**
  * Load gettext functions.

libraries/vendor_config.php

@@ -13,6 +13,12 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+/**
+ * Path to vendor autoload file. Useful when you want to
+ * have have vendor dependencies somewhere else.
+ */
+define('AUTOLOAD_FILE', './vendor/autoload.php');
+
 /**
  * Directory where cache files are stored.
  */

scripts/advisor2po

@@ -50,7 +50,8 @@ function print_message($idx) {
 }
 
 define('PHPMYADMIN', 1);
-require_once 'vendor/autoload.php';
+require_once 'libraries/vendor_config.php';
+require_once AUTOLOAD_FILE;
 require_once 'libraries/core.lib.php';
 
 $rules = PMA\libraries\Advisor::parseRulesFile();

scripts/generate-twig-cache

@@ -1,8 +1,8 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4 ft=php: */
 define('PHPMYADMIN', 1);
-require_once 'vendor/autoload.php';
 require_once 'libraries/vendor_config.php';
+require_once AUTOLOAD_FILE;
 
 use PMA\libraries\twig\I18nExtension;
 use PMA\libraries\twig\UrlExtension;

test/bootstrap-dist.php

@@ -59,7 +59,7 @@ if (PHP_SAPI == 'cli') {
 }
 
 require_once 'libraries/vendor_config.php';
-require_once 'vendor/autoload.php';
+require_once AUTOLOAD_FILE;
 require_once 'libraries/core.lib.php';
 PhpMyAdmin\MoTranslator\Loader::loadFunctions();
 $CFG = new PMA\libraries\Config();