Merge pull request #548 from nanasess/independent-of-cli

ec-cube2/cli に依存しないよう修正

.github/workflows/e2e-tests.yml

@@ -44,6 +44,7 @@ jobs:
         sudo chmod -R g+w zap
         docker-compose up -d
         docker-compose exec -T ec-cube composer install
+        docker-compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" --ignore-platform-req=php -W
         docker-compose exec -T ec-cube composer update 'symfony/*' --ignore-platform-req=php -W
         docker-compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5
         docker-compose exec -T postgres psql --user=eccube_db_user eccube_db -c "UPDATE dtb_customer SET email = '[email protected]' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);"

.github/workflows/main.yml

@@ -72,6 +72,10 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-composer-
 
+    # see https://github.com/composer/composer/issues/10340
+    - run: sudo composer selfupdate --2.2
+      if: matrix.php < 7.2
+
     - name: composer install
       run: composer install --no-interaction -o
 
@@ -165,7 +169,7 @@ jobs:
       shell: bash
 
     # see https://github.com/composer/composer/issues/10340
-    - run: composer selfupdate 2.2.11
+    - run: composer selfupdate --2.2
       if: matrix.php < 7.2
 
     - name: composer install

.github/workflows/penetration-tests.yml

@@ -49,6 +49,7 @@ jobs:
         sudo chmod -R g+w zap
         docker-compose up -d
         docker-compose exec -T ec-cube composer install
+        docker-compose exec -T ec-cube composer require ec-cube2/cli "dev-master@dev" --ignore-platform-req=php -W
         docker-compose exec -T ec-cube composer update 'symfony/*' --ignore-platform-req=php -W
         docker-compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5
         docker-compose exec -T postgres psql --user=eccube_db_user eccube_db -c "UPDATE dtb_customer SET email = '[email protected]' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);"

composer.json

@@ -22,11 +22,10 @@
         }
     },
     "require-dev": {
-        "ec-cube2/cli": "dev-master@dev",
         "fzaninotto/faker": "^1.8",
         "guzzlehttp/guzzle": "^5.3",
+        "nanasess/eccube2-fixture-generator": "^1.1",
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
-        "nanasess/eccube2-fixture-generator": "dev-main@dev",
         "php5friends/phpunit48": ">=4.8.41"
     },
     "require": {