Skip to content

Commit

Permalink
fixed main config vendorPath
Browse files Browse the repository at this point in the history
  • Loading branch information
hiqsol committed Jan 14, 2016
1 parent 4b5deff commit 97da7e1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions _bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

foreach ([__DIR__ . '/vendor/autoload.php', __DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php'] as $file) {
if (file_exists($file)) {
define('HIDEV_COMPOSER_INSTALL', $file);
define('HIDEV_AUTOLOAD_FILE', $file);
break;
}
}

if (!defined('HIDEV_COMPOSER_INSTALL')) {
if (!defined('HIDEV_AUTOLOAD_FILE')) {
fwrite(STDERR, 'You need to set up project dependencies with composer');
}

require HIDEV_COMPOSER_INSTALL;
require HIDEV_AUTOLOAD_FILE;
2 changes: 1 addition & 1 deletion src/base/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'id' => 'hidev',
'name' => 'HiDev',
'basePath' => dirname(__DIR__),
'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
'vendorPath' => dirname(HIDEV_AUTOLOAD_FILE),
'runtimePath' => dirname(substr(__DIR__, 0, 7) === 'phar://' ? $_SERVER['SCRIPT_NAME'] : dirname(__DIR__)) . '/runtime',
'enableCoreCommands' => false,
'controllerNamespace' => 'hidev\\controllers',
Expand Down

0 comments on commit 97da7e1

Please sign in to comment.