From 8d4b8d868e864225aaa376bcc8c02d81baf4ad9c Mon Sep 17 00:00:00 2001 From: Allan Paiste Date: Fri, 21 Apr 2017 14:44:48 +0300 Subject: [PATCH 1/3] Update README.md Changed the readme to refer to the fork-chain that has been happening in reality --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index be3c4480..b94e9909 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Magento Composer Installer -This is a fork of the [Magento Composer Installer](https://github.com/magento-hackathon/magento-composer-installer) repo that provides support for Magento 2 components (modules, themes, language packages, libraries and components). +This is a fork of [Magento's fork](https://github.com/magento/magento-composer-installer) of Magento Hackathon composer package to be able to address some installation issues that one might encounter due to some code changes VS the original module. ## Usage @@ -203,4 +203,4 @@ Example: `path` is a path to file relative to the Magento root folder # Notes -- The extra->magento-root-dir option is no longer supported. It displays only to preseve backward compatibility. \ No newline at end of file +- The extra->magento-root-dir option is no longer supported. It displays only to preseve backward compatibility. From 7b5d9659dff2b34ce80a18d346f753a6848ad5b5 Mon Sep 17 00:00:00 2001 From: Allan Paiste Date: Fri, 21 Apr 2017 14:48:55 +0300 Subject: [PATCH 2/3] Update ModmanParser.php add a default value to __construct's 3rd argument as two first have a default and having 3rd without one causes crashes with some older code. --- src/MagentoHackathon/Composer/Magento/ModmanParser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MagentoHackathon/Composer/Magento/ModmanParser.php b/src/MagentoHackathon/Composer/Magento/ModmanParser.php index 93b78000..01f0b721 100644 --- a/src/MagentoHackathon/Composer/Magento/ModmanParser.php +++ b/src/MagentoHackathon/Composer/Magento/ModmanParser.php @@ -25,7 +25,7 @@ class ModmanParser extends PathTranslationParser * * @param string $moduleDir */ - public function __construct($moduleDir = null, $translations = array(), $pathSuffix) + public function __construct($moduleDir = null, $translations = array(), $pathSuffix = '') { parent::__construct($translations, $pathSuffix); From fc4a1c27c52d20c3fe654ed7b8fb52e5584a9187 Mon Sep 17 00:00:00 2001 From: Allan Paiste Date: Fri, 21 Apr 2017 14:55:27 +0300 Subject: [PATCH 3/3] Update README.md Rollback on readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b94e9909..9a770eef 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Magento Composer Installer -This is a fork of [Magento's fork](https://github.com/magento/magento-composer-installer) of Magento Hackathon composer package to be able to address some installation issues that one might encounter due to some code changes VS the original module. +This is a fork of the [Magento Composer Installer](https://github.com/magento-hackathon/magento-composer-installer) repo that provides support for Magento 2 components (modules, themes, language packages, libraries and components). ## Usage