hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-09-13 20:50:18 +02:00
Code Issues Releases Wiki Activity

Merge pull request #118 from edpauto/improved-autoloader

Browse Source 
Autoloading classes with composer autoloader
This commit is contained in:
Andrés Montañez 2014-09-13 17:27:14 -03:00
commit 2ecb7e2dda
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,6 +3,7 @@
.project .project
.buildpath .buildpath
.idea .idea
vendor
# OS generated files # // GitHub Recommendation # OS generated files # // GitHub Recommendation
###################### ######################

14
bin/mage
View File

@ -9,8 +9,6 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Mage\Autoload;
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
$baseDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname(__FILE__));
@ -18,10 +16,14 @@ $baseDir = dirname(dirname(__FILE__));
define('MAGALLANES_VERSION', '1.0.1'); define('MAGALLANES_VERSION', '1.0.1');
define('MAGALLANES_DIRECTORY', $baseDir); define('MAGALLANES_DIRECTORY', $baseDir);
// Preload if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
require_once $baseDir . '/Mage/Autoload.php'; require_once __DIR__ . '/../vendor/autoload.php';
$loader = new Autoload(); } else {
spl_autoload_register(array($loader, 'autoLoad')); require_once $baseDir . '/Mage/Autoload.php';
$loader = new \Mage\Autoload();
spl_autoload_register(array($loader, 'autoLoad'));
}
// Clean arguments // Clean arguments
array_shift($argv); array_shift($argv);

7
composer.json
View File

@ -8,6 +8,13 @@
"require": { "require": {
"php": ">=5.3" "php": ">=5.3"
}, },
"autoload": {
"psr-4": {
"Mage\\": "./Mage",
"Task\\": ".mage/tasks",
"Command\\": ".mage/commands"
}
},
"bin": [ "bin": [
"bin/mage" "bin/mage"
] ]