Merge pull request #880 from nanasess/use-php-faker

Use fakerphp/faker

.github/workflows/e2e-tests.yml

@@ -77,8 +77,8 @@ jobs:
         sudo chmod -R g+w zap
         docker compose up -d --wait
         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 composer require ec-cube2/cli "dev-master@dev" -W
+        docker compose exec -T ec-cube composer update 'symfony/*' -W
         docker compose exec -T ec-cube php data/vendor/bin/eccube eccube:fixtures:generate --products=5 --customers=1 --orders=5
 
     - if: ${{ matrix.db == 'pgsql' }}

.github/workflows/penetration-tests.yml

@@ -49,8 +49,8 @@ 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 composer require ec-cube2/cli "dev-master@dev" -W
+        docker-compose exec -T ec-cube composer update 'symfony/*' -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 = 'zap_user@example.com' WHERE customer_id = (SELECT MAX(customer_id) FROM dtb_customer WHERE status = 2 AND del_flg = 0);"
 

composer.json

@@ -23,9 +23,9 @@
     },
     "require-dev": {
         "doctrine/instantiator": "~1.0.5",
-        "fzaninotto/faker": "^1.8",
+        "fakerphp/faker": "^1.23",
         "nanasess/ec-cube2-class-extends-stubs": "^1.0",
-        "nanasess/eccube2-fixture-generator": "^1.2",
+        "nanasess/eccube2-fixture-generator": "^2.0",
         "php5friends/phpunit48": ">=4.8.41",
         "phpdocumentor/reflection-docblock": "~2.0.5",
         "phpstan/phpstan": "^1.10",

docker-compose.owaspzap.daemon.yml

@@ -5,7 +5,7 @@ services:
     command: bash -c "zap.sh -daemon -addonupdate -addoninstall help_ja_JP -addoninstall wappalyzer -addoninstall sequence -addonuninstall hud -configfile /zap/wrk/options.properties -certpubdump /zap/wrk/owasp_zap_root_ca.cer -host 0.0.0.0 -port 8090 -config api.addrs.addr.name=.* -config api.addrs.addr.regex=true"
     healthcheck:
       interval: 1m30s
-      retries: 3
+      retries: 5
       test:
         - CMD
         - curl