mirror of
				https://github.com/hauke68/Magallanes.git
				synced 2025-11-04 09:00:18 +01:00 
			
		
		
		
	Merge pull request #286 from 1ma/master
Fix regression introduced in 1.0.4: custom tasks not found
This commit is contained in:
		
						commit
						c2163974b2
					
				
							
								
								
									
										8
									
								
								bin/mage
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								bin/mage
									
									
									
									
									
								
							@ -22,12 +22,12 @@ if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
 | 
			
		||||
    require_once __DIR__ . '/../vendor/autoload.php';
 | 
			
		||||
} else if (file_exists(__DIR__ . '/../../../autoload.php')) {
 | 
			
		||||
    require_once __DIR__ . '/../../../autoload.php';
 | 
			
		||||
} else {
 | 
			
		||||
    require_once $baseDir . '/Mage/Autoload.php';
 | 
			
		||||
    $loader = new \Mage\Autoload();
 | 
			
		||||
    spl_autoload_register(array($loader, 'autoLoad'));
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
require_once $baseDir . '/Mage/Autoload.php';
 | 
			
		||||
$loader = new \Mage\Autoload();
 | 
			
		||||
spl_autoload_register(array($loader, 'autoLoad'));
 | 
			
		||||
 | 
			
		||||
// Clean arguments
 | 
			
		||||
array_shift($argv);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										85
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										85
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							@ -1,10 +1,11 @@
 | 
			
		||||
{
 | 
			
		||||
    "_readme": [
 | 
			
		||||
        "This file locks the dependencies of your project to a known state",
 | 
			
		||||
        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
 | 
			
		||||
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
 | 
			
		||||
        "This file is @generated automatically"
 | 
			
		||||
    ],
 | 
			
		||||
    "hash": "caa09089c7b57461ed42e97a4449f2c6",
 | 
			
		||||
    "content-hash": "f96bb31fc6bb681d0a03748eaf741a40",
 | 
			
		||||
    "packages": [],
 | 
			
		||||
    "packages-dev": [
 | 
			
		||||
        {
 | 
			
		||||
@ -951,23 +952,26 @@
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "name": "symfony/config",
 | 
			
		||||
            "version": "v2.6.4",
 | 
			
		||||
            "version": "v2.6.5",
 | 
			
		||||
            "target-dir": "Symfony/Component/Config",
 | 
			
		||||
            "source": {
 | 
			
		||||
                "type": "git",
 | 
			
		||||
                "url": "https://github.com/symfony/Config.git",
 | 
			
		||||
                "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408"
 | 
			
		||||
                "url": "https://github.com/symfony/config.git",
 | 
			
		||||
                "reference": "8e0a8b5eddc606f6232dd9107e4adec69ed8721e"
 | 
			
		||||
            },
 | 
			
		||||
            "dist": {
 | 
			
		||||
                "type": "zip",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/Config/zipball/a9f781ba1221067d1f07c8cec0bc50f81b8d7408",
 | 
			
		||||
                "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/config/zipball/8e0a8b5eddc606f6232dd9107e4adec69ed8721e",
 | 
			
		||||
                "reference": "8e0a8b5eddc606f6232dd9107e4adec69ed8721e",
 | 
			
		||||
                "shasum": ""
 | 
			
		||||
            },
 | 
			
		||||
            "require": {
 | 
			
		||||
                "php": ">=5.3.3",
 | 
			
		||||
                "symfony/filesystem": "~2.3"
 | 
			
		||||
            },
 | 
			
		||||
            "require-dev": {
 | 
			
		||||
                "symfony/phpunit-bridge": "~2.7"
 | 
			
		||||
            },
 | 
			
		||||
            "type": "library",
 | 
			
		||||
            "extra": {
 | 
			
		||||
                "branch-alias": {
 | 
			
		||||
@ -995,21 +999,21 @@
 | 
			
		||||
            ],
 | 
			
		||||
            "description": "Symfony Config Component",
 | 
			
		||||
            "homepage": "http://symfony.com",
 | 
			
		||||
            "time": "2015-01-21 20:57:55"
 | 
			
		||||
            "time": "2015-03-12 10:28:44"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "name": "symfony/console",
 | 
			
		||||
            "version": "v2.6.4",
 | 
			
		||||
            "version": "v2.6.5",
 | 
			
		||||
            "target-dir": "Symfony/Component/Console",
 | 
			
		||||
            "source": {
 | 
			
		||||
                "type": "git",
 | 
			
		||||
                "url": "https://github.com/symfony/Console.git",
 | 
			
		||||
                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34"
 | 
			
		||||
                "url": "https://github.com/symfony/console.git",
 | 
			
		||||
                "reference": "53f86497ccd01677e22435cfb7262599450a90d1"
 | 
			
		||||
            },
 | 
			
		||||
            "dist": {
 | 
			
		||||
                "type": "zip",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/Console/zipball/e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
 | 
			
		||||
                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/console/zipball/53f86497ccd01677e22435cfb7262599450a90d1",
 | 
			
		||||
                "reference": "53f86497ccd01677e22435cfb7262599450a90d1",
 | 
			
		||||
                "shasum": ""
 | 
			
		||||
            },
 | 
			
		||||
            "require": {
 | 
			
		||||
@ -1018,6 +1022,7 @@
 | 
			
		||||
            "require-dev": {
 | 
			
		||||
                "psr/log": "~1.0",
 | 
			
		||||
                "symfony/event-dispatcher": "~2.1",
 | 
			
		||||
                "symfony/phpunit-bridge": "~2.7",
 | 
			
		||||
                "symfony/process": "~2.1"
 | 
			
		||||
            },
 | 
			
		||||
            "suggest": {
 | 
			
		||||
@ -1052,21 +1057,21 @@
 | 
			
		||||
            ],
 | 
			
		||||
            "description": "Symfony Console Component",
 | 
			
		||||
            "homepage": "http://symfony.com",
 | 
			
		||||
            "time": "2015-01-25 04:39:26"
 | 
			
		||||
            "time": "2015-03-13 17:37:22"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "name": "symfony/event-dispatcher",
 | 
			
		||||
            "version": "v2.6.4",
 | 
			
		||||
            "version": "v2.6.5",
 | 
			
		||||
            "target-dir": "Symfony/Component/EventDispatcher",
 | 
			
		||||
            "source": {
 | 
			
		||||
                "type": "git",
 | 
			
		||||
                "url": "https://github.com/symfony/EventDispatcher.git",
 | 
			
		||||
                "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813"
 | 
			
		||||
                "url": "https://github.com/symfony/event-dispatcher.git",
 | 
			
		||||
                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284"
 | 
			
		||||
            },
 | 
			
		||||
            "dist": {
 | 
			
		||||
                "type": "zip",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f75989f3ab2743a82fe0b03ded2598a2b1546813",
 | 
			
		||||
                "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/70f7c8478739ad21e3deef0d977b38c77f1fb284",
 | 
			
		||||
                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284",
 | 
			
		||||
                "shasum": ""
 | 
			
		||||
            },
 | 
			
		||||
            "require": {
 | 
			
		||||
@ -1077,6 +1082,7 @@
 | 
			
		||||
                "symfony/config": "~2.0,>=2.0.5",
 | 
			
		||||
                "symfony/dependency-injection": "~2.6",
 | 
			
		||||
                "symfony/expression-language": "~2.6",
 | 
			
		||||
                "symfony/phpunit-bridge": "~2.7",
 | 
			
		||||
                "symfony/stopwatch": "~2.3"
 | 
			
		||||
            },
 | 
			
		||||
            "suggest": {
 | 
			
		||||
@ -1110,26 +1116,29 @@
 | 
			
		||||
            ],
 | 
			
		||||
            "description": "Symfony EventDispatcher Component",
 | 
			
		||||
            "homepage": "http://symfony.com",
 | 
			
		||||
            "time": "2015-02-01 16:10:57"
 | 
			
		||||
            "time": "2015-03-13 17:37:22"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "name": "symfony/filesystem",
 | 
			
		||||
            "version": "v2.6.4",
 | 
			
		||||
            "version": "v2.6.5",
 | 
			
		||||
            "target-dir": "Symfony/Component/Filesystem",
 | 
			
		||||
            "source": {
 | 
			
		||||
                "type": "git",
 | 
			
		||||
                "url": "https://github.com/symfony/Filesystem.git",
 | 
			
		||||
                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7"
 | 
			
		||||
                "url": "https://github.com/symfony/filesystem.git",
 | 
			
		||||
                "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b"
 | 
			
		||||
            },
 | 
			
		||||
            "dist": {
 | 
			
		||||
                "type": "zip",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
 | 
			
		||||
                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/filesystem/zipball/fdc5f151bc2db066b51870d5bea3773d915ced0b",
 | 
			
		||||
                "reference": "fdc5f151bc2db066b51870d5bea3773d915ced0b",
 | 
			
		||||
                "shasum": ""
 | 
			
		||||
            },
 | 
			
		||||
            "require": {
 | 
			
		||||
                "php": ">=5.3.3"
 | 
			
		||||
            },
 | 
			
		||||
            "require-dev": {
 | 
			
		||||
                "symfony/phpunit-bridge": "~2.7"
 | 
			
		||||
            },
 | 
			
		||||
            "type": "library",
 | 
			
		||||
            "extra": {
 | 
			
		||||
                "branch-alias": {
 | 
			
		||||
@ -1157,26 +1166,29 @@
 | 
			
		||||
            ],
 | 
			
		||||
            "description": "Symfony Filesystem Component",
 | 
			
		||||
            "homepage": "http://symfony.com",
 | 
			
		||||
            "time": "2015-01-03 21:13:09"
 | 
			
		||||
            "time": "2015-03-12 10:28:44"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "name": "symfony/stopwatch",
 | 
			
		||||
            "version": "v2.6.4",
 | 
			
		||||
            "version": "v2.6.5",
 | 
			
		||||
            "target-dir": "Symfony/Component/Stopwatch",
 | 
			
		||||
            "source": {
 | 
			
		||||
                "type": "git",
 | 
			
		||||
                "url": "https://github.com/symfony/Stopwatch.git",
 | 
			
		||||
                "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c"
 | 
			
		||||
                "reference": "ba4e774f71e2ce3e3f65cabac4031b9029972af5"
 | 
			
		||||
            },
 | 
			
		||||
            "dist": {
 | 
			
		||||
                "type": "zip",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/e8da5286132ba75ce4b4275fbf0f4cd369bfd71c",
 | 
			
		||||
                "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/ba4e774f71e2ce3e3f65cabac4031b9029972af5",
 | 
			
		||||
                "reference": "ba4e774f71e2ce3e3f65cabac4031b9029972af5",
 | 
			
		||||
                "shasum": ""
 | 
			
		||||
            },
 | 
			
		||||
            "require": {
 | 
			
		||||
                "php": ">=5.3.3"
 | 
			
		||||
            },
 | 
			
		||||
            "require-dev": {
 | 
			
		||||
                "symfony/phpunit-bridge": "~2.7"
 | 
			
		||||
            },
 | 
			
		||||
            "type": "library",
 | 
			
		||||
            "extra": {
 | 
			
		||||
                "branch-alias": {
 | 
			
		||||
@ -1204,26 +1216,29 @@
 | 
			
		||||
            ],
 | 
			
		||||
            "description": "Symfony Stopwatch Component",
 | 
			
		||||
            "homepage": "http://symfony.com",
 | 
			
		||||
            "time": "2015-01-03 08:01:59"
 | 
			
		||||
            "time": "2015-02-24 11:52:21"
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            "name": "symfony/yaml",
 | 
			
		||||
            "version": "v2.6.1",
 | 
			
		||||
            "version": "v2.6.5",
 | 
			
		||||
            "target-dir": "Symfony/Component/Yaml",
 | 
			
		||||
            "source": {
 | 
			
		||||
                "type": "git",
 | 
			
		||||
                "url": "https://github.com/symfony/Yaml.git",
 | 
			
		||||
                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20"
 | 
			
		||||
                "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d"
 | 
			
		||||
            },
 | 
			
		||||
            "dist": {
 | 
			
		||||
                "type": "zip",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/Yaml/zipball/3346fc090a3eb6b53d408db2903b241af51dcb20",
 | 
			
		||||
                "reference": "3346fc090a3eb6b53d408db2903b241af51dcb20",
 | 
			
		||||
                "url": "https://api.github.com/repos/symfony/Yaml/zipball/0cd8e72071e46e15fc072270ae39ea1b66b10a9d",
 | 
			
		||||
                "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d",
 | 
			
		||||
                "shasum": ""
 | 
			
		||||
            },
 | 
			
		||||
            "require": {
 | 
			
		||||
                "php": ">=5.3.3"
 | 
			
		||||
            },
 | 
			
		||||
            "require-dev": {
 | 
			
		||||
                "symfony/phpunit-bridge": "~2.7"
 | 
			
		||||
            },
 | 
			
		||||
            "type": "library",
 | 
			
		||||
            "extra": {
 | 
			
		||||
                "branch-alias": {
 | 
			
		||||
@ -1251,7 +1266,7 @@
 | 
			
		||||
            ],
 | 
			
		||||
            "description": "Symfony Yaml Component",
 | 
			
		||||
            "homepage": "http://symfony.com",
 | 
			
		||||
            "time": "2014-12-02 20:19:20"
 | 
			
		||||
            "time": "2015-03-12 10:28:44"
 | 
			
		||||
        }
 | 
			
		||||
    ],
 | 
			
		||||
    "aliases": [],
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user