Commit ac0b2c9c authored by totten's avatar totten

composer - Use classloader from civicrm-core.git instead of civicrm-packages.git.

parent cca05393
......@@ -80,7 +80,7 @@ class CRM_Core_ClassLoader {
}
$civicrm_base_path = dirname(dirname(__DIR__));
require_once dirname(dirname(__DIR__)) . '/packages/vendor/autoload.php';
require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php';
// we do this to prevent a autoloader errors with joomla / 3rd party packages
// use absolute path since we dont know the content of include_path as yet
......@@ -99,7 +99,7 @@ class CRM_Core_ClassLoader {
);
$include_paths = implode(PATH_SEPARATOR, $include_paths);
set_include_path($include_paths . PATH_SEPARATOR . get_include_path());
require_once "$civicrm_base_path/packages/vendor/autoload.php";
require_once "$civicrm_base_path/vendor/autoload.php";
}
public function initHtmlPurifier($prepend) {
......
{
"autoload": {
"psr-0": {
"PHPUnit_": ["."],
"Civi\\": ["../", "../tests/phpunit/"]
"PHPUnit_": ["packages/"],
"Civi\\": [".", "tests/phpunit/"]
}
},
"require": {
......
......@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "6778140f210ee24575efdd0b8f32bb11",
"hash": "33b8ac9b59c02e57b8aa1b24bee3c378",
"packages": [
{
"name": "psr/log",
......@@ -208,21 +208,11 @@
"time": "2014-07-10 08:55:37"
}
],
"packages-dev": [
],
"aliases": [
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [
],
"stability-flags": [],
"prefer-stable": false,
"platform": [
],
"platform-dev": [
]
"platform": [],
"platform-dev": []
}
......@@ -23,7 +23,7 @@ if ( file_exists( '/etc/timezone' ) ) {
# Crank up the memory
ini_set('memory_limit', '2G');
require_once $GLOBALS['base_dir'] . '/packages/vendor/autoload.php';
require_once $GLOBALS['base_dir'] . '/vendor/autoload.php';
/*
require $GLOBALS['base_dir'] . DIRECTORY_SEPARATOR .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment