Fix behat symfony extension and use updated test packages for all ake…

…neo versions symfony/flex doesn't appear to auto add this bundle even if added directly to the project (it's indirect and so doesn't do recipes)
inviqa · Jan 20, 2023 · a01ebdb · a01ebdb
1 parent add0d64
commit a01ebdb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 23 deletions.
diff --git a/src/akeneo/application/skeleton/behat.yml.twig b/src/akeneo/application/skeleton/behat.yml.twig
@@ -19,17 +19,23 @@ default:
         - App\Acceptance\Context\WebWithPageObjectsWithConstructorInjectionContext
 
   extensions:
-    Behat\Symfony2Extension:
+    FriendsOfBehat\SymfonyExtension:      
+      bootstrap: config/bootstrap.php
       kernel:
         class: Kernel
-        bootstrap: config/bootstrap.php
+        environment: test
     Behat\MinkExtension:
       base_url: 'https://{{ @('hostname') }}'
       default_session: goutte
       javascript_session: chrome
       sessions:
         goutte:
           goutte:
+            # Symfony HttpClient
+            server_parameters:
+              verify_peer: false
+              verify_host: false
+            # Guzzle
             guzzle_parameters:
               verify: false
         chrome:

diff --git a/src/akeneo/application/skeleton/composer.json.twig b/src/akeneo/application/skeleton/composer.json.twig
@@ -37,44 +37,29 @@
     "akeneo/pim-{{ @('akeneo.edition') }}-dev": "^{{ @('akeneo.major_version') }}.0.0"
   },
   "require-dev": {
-{% if version_compare(@('akeneo.major_version'), '6', '>=') %}
     "behat/behat": "^3.12",
     "friends-of-behat/mink-extension": "^2.7",
     "behat/mink-goutte-driver": "^2.0",
     "friends-of-behat/symfony-extension": "^2.4",
     "dmore/behat-chrome-extension": "^1.4",
     "dmore/chrome-mink-driver": "^2.8",
-    "league/flysystem-aws-s3-v3": "^2.0",
     "rector/rector": "^0.15",
     "phpcompatibility/php-compatibility": "dev-develop",
     "phpcsstandards/phpcsutils": "1.0.0-alpha4",
     "phpmd/phpmd": "^2.13",
-    "phpspec/phpspec": "^7.2",
+    "phpspec/phpspec": "^7.3",
     "phpstan/phpstan": "^1.9",
     "phpunit/phpunit": "^9.5",
     "sensiolabs/behat-page-object-extension": "^2.3",
     "slevomat/coding-standard": "^8.6",
     "squizlabs/php_codesniffer": "^3.7",
-    "symfony/debug-bundle": "^5.4"
+{% if version_compare(@('akeneo.major_version'), '6', '>=') %}
+    "league/flysystem-aws-s3-v3": "^2.0",
+    "symfony/debug-bundle": "^5.4",
+    "symfony/web-profiler-bundle": "^5.4"
 {% else %}
-    "behat/behat": "^3.5",
-    "behat/mink-extension": "^2.3",
-    "behat/mink-goutte-driver": "^1.2",
-    "behat/symfony2-extension": "^2.1",
-    "dmore/behat-chrome-extension": "^1.3",
-    "dmore/chrome-mink-driver": "^2.7",
-    "doctrine/doctrine-migrations-bundle": "1.3.2",
     "league/flysystem-aws-s3-v3": "^1.0",
-    "rector/rector": "^0.7",
-    "phpcompatibility/php-compatibility": "dev-develop",
-    "phpcsstandards/phpcsutils": "1.0.0-alpha4",
-    "phpmd/phpmd": "^2.7",
-    "phpspec/phpspec": "^6.0",
-    "phpstan/phpstan": "^0.12",
-    "phpunit/phpunit": "^8.4",
-    "sensiolabs/behat-page-object-extension": "^2.3",
-    "slevomat/coding-standard": "^6.0",
-    "squizlabs/php_codesniffer": "^3.5",
+    "doctrine/doctrine-migrations-bundle": "1.3.2",
     "symfony/debug-bundle": "^4.4.7",
     "symfony/web-profiler-bundle": "^4.4.7",
     "symfony/web-server-bundle": "^4.4.7"

diff --git a/src/akeneo/application/skeleton/config/bundles.php b/src/akeneo/application/skeleton/config/bundles.php
@@ -0,0 +1,5 @@
+<?php
+
+return [
+    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true]
+];