inviqa · g-foster2020 · Feb 15, 2023 · Jan 19, 2023 · Jan 19, 2023 · Jan 19, 2023
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
                     }
                     when {
                         beforeAgent true
-                        expression { return isHarnessChange(['base', 'drupal8', 'wordpress']) }
+                        expression { return isHarnessChange(['base', 'akeneo', 'drupal8', 'wordpress']) }
                     }
                     stages {
                         stage('Prepare') {
@@ -54,16 +54,19 @@ pipeline {
                             steps {
                                 sh './test php static'
                                 sh './test drupal8 static'
+                                sh './test akeneo6 static'
                                 sh './test akeneo5 static'
                                 sh './test akeneo4 static'
                                 sh './test wordpress static'
                                 sh './test php dynamic'
                                 sh './test drupal8 dynamic'
+                                sh './test akeneo6 dynamic'
                                 sh './test akeneo5 dynamic'
                                 sh './test akeneo4 dynamic'
                                 sh './test wordpress dynamic'
                                 sh './test php dynamic mutagen'
                                 sh './test drupal8 dynamic mutagen'
+                                sh './test akeneo6 dynamic mutagen'
                                 sh './test akeneo5 dynamic mutagen'
                                 sh './test akeneo4 dynamic mutagen'
                                 sh './test wordpress dynamic mutagen'
@@ -83,6 +86,10 @@ pipeline {
                                     when { expression { return isHarnessChange(['drupal8']) } }
                                     steps { sh './test drupal8 static' }
                                 }
+                                stage('Akeneo 6') {
+                                    when { expression { return isHarnessChange(['akeneo']) } }
+                                    steps { sh './test akeneo6 static' }
+                                }
                                 stage('Akeneo 5') {
                                     when { expression { return isHarnessChange(['akeneo']) } }
                                     steps { sh './test akeneo5 static' }
@@ -104,6 +111,10 @@ pipeline {
                                     when { expression { return isHarnessChange(['drupal8']) } }
                                     steps { sh './test drupal8 dynamic' }
                                 }
+                                stage('Akeneo 6 Dynamic') {
+                                    when { expression { return isHarnessChange(['akeneo']) } }
+                                    steps { sh './test akeneo6 dynamic' }
+                                }
                                 stage('Akeneo 5 Dynamic') {
                                     when { expression { return isHarnessChange(['akeneo']) } }
                                     steps { sh './test akeneo5 dynamic' }
@@ -125,6 +136,10 @@ pipeline {
                                     when { expression { return isHarnessChange(['drupal8']) } }
                                     steps { sh './test drupal8 dynamic mutagen' }
                                 }
+                                stage('Akeneo 6 Mutagen') {
+                                    when { expression { return isHarnessChange(['akeneo']) } }
+                                    steps { sh './test akeneo6 dynamic mutagen' }
+                                }
                                 stage('Akeneo 5 Mutagen') {
                                     when { expression { return isHarnessChange(['akeneo']) } }
                                     steps { sh './test akeneo5 dynamic mutagen' }

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",
+    "friends-of-behat/mink-extension": "^2.7",
+    "friends-of-behat/symfony-extension": "^2.4",
     "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",
+    "rector/rector": "^0.15",
     "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",
     "symfony/debug-bundle": "^4.4.7",
     "symfony/web-profiler-bundle": "^4.4.7",
     "symfony/web-server-bundle": "^4.4.7"
@@ -125,7 +110,7 @@
   },
   "config": {
     "platform": {
-      "php": "{{ (version_compare(@('akeneo.major_version'), '5', '>=')) ? '7.4' : '7.3.22' }}"
+      "php": "{{ @('php.version') }}"
     },
     "allow-plugins": {
       "symfony/flex": true,

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]
+];
diff --git a/src/akeneo/application/skeleton/phpstan-baseline.neon b/src/akeneo/application/skeleton/phpstan-baseline.neon
@@ -1,16 +1,8 @@
 parameters:
-	ignoreErrors:
-		-
-			message: "#^Parameter \\#1 \\$arr1 of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
-			count: 1
-			path: src/Kernel.php
-
-		-
-			message: "#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
-			count: 1
-			path: src/Kernel.php
-
-		-
-			message: "#^Parameter \\#3 \\.\\.\\.\\$args of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
-			count: 1
-			path: src/Kernel.php
+  ignoreErrors:
+    - message: "#^Parameter \\#\\d .* of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
+      count: 3
+      path: src/Kernel.php
+    - message: "#Generator expects value type Symfony\\\\Component\\\\HttpKernel\\\\Bundle\\\\BundleInterface, object given\\.#"
+      reportUnmatched: false
+      path: src/Kernel.php    
diff --git a/src/akeneo/harness.yml b/src/akeneo/harness.yml
@@ -113,6 +113,7 @@ attributes:
     build:
       when: -f "package.json"
       steps:
+        - export NODE_OPTIONS=--openssl-legacy-provider
         - run yarn install --frozen-lockfile
         - run bin/console cache:warmup
         - run bin/console pim:installer:assets --symlink --clean

diff --git a/test b/test
@@ -36,6 +36,9 @@ function main()
     elif [[ "$harness" =~ ^(akeneo5)$ ]]; then
         akeneo_version=5
         harness="akeneo"
+    elif [[ "$harness" =~ ^(akeneo6)$ ]]; then
+        akeneo_version=6
+        harness="akeneo"
     fi
 
     if [[ "$REUSE_EXISTING_WORKSPACE" != "yes" ]]; then