diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 5509a89ab6..baa49396c8 100644 --- a/libraries/common.inc.php +++ b/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 ./vendor/autoload.php missing or not readable.
' + 'File ' . AUTOLOAD_FILE . ' missing or not readable.
' . 'Most likely you did not run Composer to ' . 'install library files.' ); } -require_once './vendor/autoload.php'; +require_once AUTOLOAD_FILE; /** * Load gettext functions. diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index 1ddb3c2083..c576b1101e 100644 --- a/libraries/vendor_config.php +++ b/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. */ diff --git a/scripts/advisor2po b/scripts/advisor2po index 8b190a5cf0..fd7755c23f 100644 --- a/scripts/advisor2po +++ b/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(); diff --git a/scripts/generate-twig-cache b/scripts/generate-twig-cache index 74cc014821..ef331ca938 100644 --- a/scripts/generate-twig-cache +++ b/scripts/generate-twig-cache @@ -1,8 +1,8 @@