diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 3e3853a..5ce1e7b 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -3138,7 +3138,7 @@ function drupal_classloader($class_loader = NULL) { if (!isset($loader)) { // Include the Symfony ClassLoader for loading PSR-0-compatible classes. - require_once DRUPAL_ROOT . '/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php'; + require_once DRUPAL_ROOT . '/vendor/symfony/class-loader/Symfony/Component/ClassLoader/UniversalClassLoader.php'; if (!isset($class_loader) && class_exists('Drupal\Component\Utility\Settings', FALSE)) { $class_loader = settings()->get('class_loader'); } @@ -3146,7 +3146,7 @@ function drupal_classloader($class_loader = NULL) { switch ($class_loader) { case 'apc': if (function_exists('apc_store')) { - require_once DRUPAL_ROOT . '/core/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php'; + require_once DRUPAL_ROOT . '/vendor/symfony/class-loader/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php'; $loader = new ApcUniversalClassLoader('drupal.' . drupal_get_hash_salt()); break; } @@ -3173,7 +3173,7 @@ function drupal_classloader($class_loader = NULL) { // by Composer. Composer combines libraries that use PHP 5.3 namespaces and // ones that use PEAR-like class prefixes in a single array, but the Symfony // class loader requires them to be registered separately. - $prefixes_and_namespaces = require DRUPAL_ROOT . '/core/vendor/composer/autoload_namespaces.php'; + $prefixes_and_namespaces = require DRUPAL_ROOT . '/vendor/composer/autoload_namespaces.php'; $prefixes = array(); $namespaces = array(); foreach ($prefixes_and_namespaces as $key => $path) { diff --git a/example.composer.json b/example.composer.json new file mode 100644 index 0000000..2beb094 --- /dev/null +++ b/example.composer.json @@ -0,0 +1,10 @@ +{ + "name": "myproject/myproject", + "description": "My drupal site.", + "license": "GPL-2.0+", + "require": { + "kimpepper/drupal": "*", + "solarium/solarium": "3.0.1" + }, + "minimum-stability": "dev" +} diff --git a/example.gitignore b/example.gitignore index d25a209..f78467b 100644 --- a/example.gitignore +++ b/example.gitignore @@ -23,3 +23,6 @@ sites/*/private # Ignore paths that contain user-generated content. # */files # */private + +# Ignore vendor directory +vendor/* \ No newline at end of file