From 948885e50a404f745e6f90e75b909309044a9f1d Mon Sep 17 00:00:00 2001 From: Atish Goswami Date: Thu, 1 Jun 2017 18:28:23 +0530 Subject: [PATCH 1/3] Addes fixes for ISSUE #12 --- .travis.yml | 7 +++---- src/composer.json => composer.json | 2 +- src/composer.lock => composer.lock | 0 docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) rename src/composer.json => composer.json (95%) rename src/composer.lock => composer.lock (100%) diff --git a/.travis.yml b/.travis.yml index d6f3054..df78214 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: php - + cache: directories: - src/vendor/ @@ -8,13 +8,12 @@ cache: php: - 5.6 - 7.0 - + before_script: - - cd src/ - composer config --global http-basic.repo.magento.com $COMPOSER_MAGENTO_USERNAME $COMPOSER_MAGENTO_PASSWORD - composer self-update - composer install --prefer-source --no-interaction --dev --no-scripts - + script: - phpunit --coverage-clover "coverage.xml" -c dev/tests/unit/phpunit.xml diff --git a/src/composer.json b/composer.json similarity index 95% rename from src/composer.json rename to composer.json index 38a9047..2296f76 100644 --- a/src/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "autoload": { "files": [ "registration.php" ], "psr-4": { - "Meanbee\\MagentoRoyalmail\\": "" + "Meanbee\\MagentoRoyalmail\\": "src/" } }, "authors": [ diff --git a/src/composer.lock b/composer.lock similarity index 100% rename from src/composer.lock rename to composer.lock diff --git a/docker-compose.yml b/docker-compose.yml index a6a7b9a..601d9d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ appdata: image: tianon/true volumes: - ./magento:/var/www/magento - - ./:/src + - ./:./src - ~/.composer/cache:/root/.composer/cache fpm: From e1218111311057620434c26c10648fe052eb6479 Mon Sep 17 00:00:00 2001 From: Atish Goswami Date: Thu, 1 Jun 2017 18:54:31 +0530 Subject: [PATCH 2/3] Addes fixes for travis build ISSUE#12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df78214..480f72b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ php: - 7.0 before_script: - - composer config --global http-basic.repo.magento.com $COMPOSER_MAGENTO_USERNAME $COMPOSER_MAGENTO_PASSWORD + - composer config --global --auth http-basic.repo.magento.com $COMPOSER_MAGENTO_USERNAME $COMPOSER_MAGENTO_PASSWORD - composer self-update - composer install --prefer-source --no-interaction --dev --no-scripts From 0bbc472c95ff8fbdea502a8935e99f768a014b96 Mon Sep 17 00:00:00 2001 From: Atish Goswami Date: Tue, 11 Jul 2017 15:27:20 +0530 Subject: [PATCH 3/3] Addes fixes for registration.php ISSUE #12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2296f76..ec66779 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "friendsofphp/php-cs-fixer": "~1.10" }, "autoload": { - "files": [ "registration.php" ], + "files": [ "src/registration.php" ], "psr-4": { "Meanbee\\MagentoRoyalmail\\": "src/" }