mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 23:25:30 +02:00
[ticket/10893] Update the usage of Composer
Changes 'vendor/.composer/autoload.php' to 'vendor/autoload.php' as per the change in the way that composer works as noted https://groups.google.com/forum/#!msg/composer-dev/fWIs3KocwoA/nU3aLko9LhQJ PHPBB3-10893
This commit is contained in:
parent
1fd2795cf0
commit
47c6b32d87
@ -150,7 +150,7 @@ if (function_exists('date_default_timezone_set') && function_exists('date_defaul
|
|||||||
// Autoloading of dependencies.
|
// Autoloading of dependencies.
|
||||||
// Three options are supported:
|
// Three options are supported:
|
||||||
// 1. If dependencies are installed with Composer, Composer will create a
|
// 1. If dependencies are installed with Composer, Composer will create a
|
||||||
// vendor/.composer/autoload.php. If this file exists it will be
|
// vendor/autoload.php. If this file exists it will be
|
||||||
// automatically used by phpBB. This is the default mode that phpBB
|
// automatically used by phpBB. This is the default mode that phpBB
|
||||||
// will use when shipped.
|
// will use when shipped.
|
||||||
// 2. To disable composer autoloading, PHPBB_NO_COMPOSER_AUTOLOAD can be specified.
|
// 2. To disable composer autoloading, PHPBB_NO_COMPOSER_AUTOLOAD can be specified.
|
||||||
@ -171,11 +171,11 @@ if (getenv('PHPBB_NO_COMPOSER_AUTOLOAD'))
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!file_exists($phpbb_root_path . 'vendor/.composer/autoload.php'))
|
if (!file_exists($phpbb_root_path . 'vendor/autoload.php'))
|
||||||
{
|
{
|
||||||
trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR);
|
trigger_error('You have not set up composer dependencies. See http://getcomposer.org/.', E_USER_ERROR);
|
||||||
}
|
}
|
||||||
require($phpbb_root_path . 'vendor/.composer/autoload.php');
|
require($phpbb_root_path . 'vendor/autoload.php');
|
||||||
}
|
}
|
||||||
|
|
||||||
$starttime = explode(' ', microtime());
|
$starttime = explode(' ', microtime());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user