hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2026-09-05 00:48:57 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse Source
This commit is contained in:
Jakub Turek
2015-02-19 20:29:59 +01:00
parent 8a9aee4395 bb9e842bd5
commit c64364ce60
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/mage
+2
View File
@@ -18,6 +18,8 @@ define('MAGALLANES_DIRECTORY', $baseDir);
if (file_exists(__DIR__ . '/../vendor/autoload.php')) { if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
require_once __DIR__ . '/../vendor/autoload.php'; require_once __DIR__ . '/../vendor/autoload.php';
} else if (file_exists(__DIR__ . '/../../../autoload.php')) {
require_once __DIR__ . '/../../../autoload.php';
} else { } else {
require_once $baseDir . '/Mage/Autoload.php'; require_once $baseDir . '/Mage/Autoload.php';
$loader = new \Mage\Autoload(); $loader = new \Mage\Autoload();
composer.json
+2 -2
View File
@@ -14,8 +14,8 @@
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Mage\\": "./Mage", "Mage\\": "./Mage",
"Task\\": ".mage/tasks", "Task\\": [".mage/tasks", "../../../.mage/tasks"],
"Command\\": ".mage/commands" "Command\\": [".mage/tasks", "../../../.mage/commands"]
} }
}, },
"config": { "config": {