tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

NEW: Use composer autoloader to set the right include path.

Browse Source
This commit is contained in:
Sam Minnee 2016-11-01 15:45:56 +13:00
parent 7a10c194bd
commit e9d2f2f733
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -53,6 +53,7 @@
"classmap": ["tests/behat/features/bootstrap"] "classmap": ["tests/behat/features/bootstrap"]
}, },
"include-path": [ "include-path": [
"src/",
"thirdparty/" "thirdparty/"
], ],
"min-stability": "dev", "min-stability": "dev",

17
src/Core/Constants.php
View File

@ -248,24 +248,11 @@ if(!defined('ASSETS_PATH')) {
define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR); define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
} }
/////////////////////////////////////////////////////////////////////////////// // Custom include path - deprecated
// INCLUDES
if(defined('CUSTOM_INCLUDE_PATH')) { if(defined('CUSTOM_INCLUDE_PATH')) {
$includePath = '.' . PATH_SEPARATOR . CUSTOM_INCLUDE_PATH . PATH_SEPARATOR set_include_path(CUSTOM_INCLUDE_PATH . PATH_SEPARATOR . get_include_path());
. FRAMEWORK_PATH . PATH_SEPARATOR
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
. THIRDPARTY_PATH . PATH_SEPARATOR
. get_include_path();
} else {
$includePath = '.' . PATH_SEPARATOR . FRAMEWORK_PATH . PATH_SEPARATOR
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
. THIRDPARTY_PATH . PATH_SEPARATOR
. get_include_path();
} }
set_include_path($includePath);
/** /**
* Define the temporary folder if it wasn't defined yet * Define the temporary folder if it wasn't defined yet
*/ */