From c6f4d1ffdae08ce6aeea3656436ff817719ad858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= Date: Sun, 28 Dec 2014 14:36:47 +0100 Subject: [PATCH 1/6] Changing vendor name to mine for testing --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4018174..33ba7c6 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "andres-montanez/magallanes", + "name": "jhuet/magallanes", "description": "A Deployment Tool for PHP Applications", "homepage": "http://magephp.com", "license": "MIT", From 4cce76472e6ee67d6a88d1abe36c39f403aca7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= Date: Sun, 28 Dec 2014 14:45:13 +0100 Subject: [PATCH 2/6] Fix to actual composer autoload.php --- bin/mage | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mage b/bin/mage index 728e3aa..2f316e4 100755 --- a/bin/mage +++ b/bin/mage @@ -16,8 +16,8 @@ $baseDir = dirname(dirname(__FILE__)); define('MAGALLANES_VERSION', '1.0.3'); define('MAGALLANES_DIRECTORY', $baseDir); -if (file_exists(__DIR__ . '/../vendor/autoload.php')) { - require_once __DIR__ . '/../vendor/autoload.php'; +if (file_exists(__DIR__ . '/../../../autoload.php')) { + require_once __DIR__ . '/../../../autoload.php'; } else { require_once $baseDir . '/Mage/Autoload.php'; $loader = new \Mage\Autoload(); From 254de77c79c9a3bf14cf7f273044767908a056bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= Date: Sun, 28 Dec 2014 14:48:01 +0100 Subject: [PATCH 3/6] Fix to actual .mage directory when used with composer --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 33ba7c6..3ea9730 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ "autoload": { "psr-4": { "Mage\\": "./Mage", - "Task\\": ".mage/tasks", - "Command\\": ".mage/commands" + "Task\\": "../../../.mage/tasks", + "Command\\": "../../../.mage/commands" } }, "bin": [ From 09e2ad6a1fe5534e75b5508c05a04a2433b4a686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= Date: Sun, 28 Dec 2014 14:53:03 +0100 Subject: [PATCH 4/6] Rolling back to official vendor name --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3ea9730..3c092ac 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "jhuet/magallanes", + "name": "andres-montanez/magallanes", "description": "A Deployment Tool for PHP Applications", "homepage": "http://magephp.com", "license": "MIT", From 892a60c57461176dd7acc60d4f10c1291788aba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= Date: Mon, 5 Jan 2015 14:30:41 +0100 Subject: [PATCH 5/6] Allow for both ways to find composer's autoload --- bin/mage | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/mage b/bin/mage index 2f316e4..986bafb 100755 --- a/bin/mage +++ b/bin/mage @@ -16,7 +16,9 @@ $baseDir = dirname(dirname(__FILE__)); define('MAGALLANES_VERSION', '1.0.3'); define('MAGALLANES_DIRECTORY', $baseDir); -if (file_exists(__DIR__ . '/../../../autoload.php')) { +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'; From 364c2ecc90b7e1bbe0f1c0c83d7e696de825c4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= Date: Mon, 5 Jan 2015 14:33:29 +0100 Subject: [PATCH 6/6] Allow for both directories for Task and Command namespaces --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3c092ac..f921960 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ "autoload": { "psr-4": { "Mage\\": "./Mage", - "Task\\": "../../../.mage/tasks", - "Command\\": "../../../.mage/commands" + "Task\\": [".mage/tasks", "../../../.mage/tasks"], + "Command\\": [".mage/tasks", "../../../.mage/commands"] } }, "bin": [