Merge remote-tracking branch 'origin/4.5' into temp_8.3_to_4.5

ibexa · Sep 8, 2023 · d472305 · d472305
2 parents 431d3f2 + 0ddb443
commit d472305
Show file tree

Hide file tree

Showing 225 changed files with 1,831 additions and 1,497 deletions.
diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml
@@ -3,7 +3,7 @@ name: Browser tests
 on:
     push:
         branches:
-            - master
+            - main
             - '[0-9]+.[0-9]+'
     pull_request: ~
 
@@ -13,18 +13,18 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             test-suite:  '--profile=browser --suite=admin-ui-full'
-            test-setup-phase-1: '--profile=setup --suite=personas --mode=standard'
-            test-setup-phase-2: '--profile=setup --suite=content-translation --mode=standard'
+            test-setup-phase-1: '--profile=regression --suite=setup-oss --mode=standard'
+            multirepository: true
+            timeout: 40
+            php-image: "ezsystems/php:8.1-v2-node16"
         secrets:
             SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
     examples:
         name: "BehatBundle examples"
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: 'oss'
-            project-version: '^3.3.x-dev'
             test-suite:  '--mode=standard --profile=service --suite=examples'
         secrets:
             SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
       - '[0-9]+.[0-9]+'
   pull_request: ~
 
@@ -17,7 +17,6 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - '7.3'
           - '7.4'
           - '8.0'
           - '8.1'
@@ -45,13 +44,13 @@ jobs:
       - name: Run test suite
         run: composer run-script --timeout=600 test
 
-  cs_fix:
+  cs-fix:
     name: Run code style check
     runs-on: "ubuntu-20.04"
     strategy:
       matrix:
         php:
-          - "7.3"
+          - '8.1'
     steps:
       - uses: actions/checkout@v2
 
@@ -60,6 +59,7 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: none
+          extensions: 'pdo_sqlite, gd'
           tools: cs2pr
 
       - uses: "ramsey/composer-install@v1"

diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ composer.phar
 .phpunit.result.cache
 .php_cs.cache
 .phpunit.cache
+.php-cs-fixer.cache
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+
+use Ibexa\CodeStyle\PhpCsFixer\InternalConfigFactory;
+
+$configFactory = new InternalConfigFactory();
+
+return $configFactory
+    ->buildConfig()
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(
+                array_filter([
+                    __DIR__ . '/src',
+                    __DIR__ . '/tests',
+                ], 'is_dir')
+            )
+            ->files()->name('*.php')
+    );
diff --git a/.php_cs b/.php_cs
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@ This package is part of [Ibexa DXP](https://ibexa.co).
 [Install Ibexa DXP](https://doc.ibexa.co/en/latest/install/) and then install this package to use it:
 
 ```
-composer require --dev ezsystems/behatbundle --no-scripts --no-plugins
-composer sync-recipes ezsystems/behatbundle --force -v
+composer require --dev ibexa/behat --no-scripts --no-plugins
+composer sync-recipes ibexa/behat --force -v
 ```
 
 For more information about BehatBundle, see:

diff --git a/behat_ibexa_commerce.yaml b/behat_ibexa_commerce.yaml
@@ -1,65 +1,62 @@
 imports:
     - behat_ibexa_experience.yaml
-    - vendor/ezsystems/ezcommerce-admin-ui/behat_suites.yml
-    - vendor/ezsystems/ezcommerce-shop/behat_suites.yml
+    - vendor/ibexa/payment/behat_suites.yml
 
 regression:
     suites:
         setup-commerce:
             paths:
-                - '%paths.base%/vendor/ezsystems/behatbundle/features/personas'
-                - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_styles.feature'
-                - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/richtextConfiguration/custom_tags.feature'
-                - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/setup/setup_experience.feature'
-                - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/loginMethods'
-                - '%paths.base%/vendor/ezsystems/behatbundle/features/setup/contentTranslation'
+                - '%paths.base%/vendor/ibexa/behat/features/personas'
+                - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_styles.feature'
+                - '%paths.base%/vendor/ibexa/behat/features/setup/richtextConfiguration/custom_tags.feature'
+                - '%paths.base%/vendor/ibexa/workflow/features/setup/setup_experience.feature'
+                - '%paths.base%/vendor/ibexa/behat/features/setup/loginMethods'
+                - '%paths.base%/vendor/ibexa/behat/features/setup/contentTranslation'
+                - '%paths.base%/vendor/ibexa/product-catalog/features/setup/setup.feature'
+                - '%paths.base%/vendor/ibexa/corporate-account/features/setup/setup.feature'
             contexts:
-                - EzSystems\Behat\API\Context\ContentContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\API\Context\LanguageContext
-                - EzSystems\Behat\API\Context\RoleContext
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\UserContext
-                - EzSystems\Behat\Core\Context\ConfigurationContext
-                - EzSystems\Behat\Core\Context\FileContext
+                - Ibexa\Behat\API\Context\ContentContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\API\Context\LanguageContext
+                - Ibexa\Behat\API\Context\RoleContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\UserContext
+                - Ibexa\Behat\Core\Context\ConfigurationContext
+                - Ibexa\Behat\Core\Context\FileContext
+                - Ibexa\Migration\Behat\Context\MigrationContext
         commerce:
             paths:
-                - '%paths.base%/vendor/ezsystems/date-based-publisher/features'
-                - '%paths.base%/vendor/ezsystems/ezcommerce-admin-ui/features/standard'
-                - '%paths.base%/vendor/ezsystems/ezcommerce-shop/features'
-                - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/personas'
-                - '%paths.base%/vendor/ezsystems/ezplatform-admin-ui/features/standard'
-                - '%paths.base%/vendor/ezsystems/ezplatform-form-builder/features'
-                - '%paths.base%/vendor/ezsystems/ezplatform-page-builder/features/DynamicLandingPage'
-                - '%paths.base%/vendor/ezsystems/ezplatform-page-builder/features/personas'
-                - '%paths.base%/vendor/ezsystems/ezplatform-page-fieldtype/features/eventSource'
-                - '%paths.base%/vendor/ezsystems/ezplatform-user/features/browser'
-                - '%paths.base%/vendor/ezsystems/ezplatform-segmentation/features'
-                - '%paths.base%/vendor/ezsystems/ezplatform-workflow/features/browser'
-                - '%paths.base%/vendor/ezsystems/ezplatform-version-comparison/features'
+                - '%paths.base%/vendor/ibexa/admin-ui/features/personas'
+                - '%paths.base%/vendor/ibexa/admin-ui/features/standard'
+                - '%paths.base%/vendor/ibexa/corporate-account/features/browser'
+                - '%paths.base%/vendor/ibexa/fieldtype-page/features/eventSource'
+                - '%paths.base%/vendor/ibexa/form-builder/features'
+                - '%paths.base%/vendor/ibexa/page-builder/features/DynamicLandingPage'
+                - '%paths.base%/vendor/ibexa/page-builder/features/personas'
+                - '%paths.base%/vendor/ibexa/payment/features'
+                - '%paths.base%/vendor/ibexa/product-catalog/features/browser'
+                - '%paths.base%/vendor/ibexa/scheduler/features'
+                - '%paths.base%/vendor/ibexa/segmentation/features'
+                - '%paths.base%/vendor/ibexa/taxonomy/features'
+                - '%paths.base%/vendor/ibexa/user/features/browser'
+                - '%paths.base%/vendor/ibexa/version-comparison/features'
+                - '%paths.base%/vendor/ibexa/workflow/features/browser'
             filters:
                 tags: "~@broken&&@IbexaCommerce"
             contexts: 
                 - Behat\MinkExtension\Context\MinkContext
-                - EzSystems\Behat\API\Context\ContentContext
-                - EzSystems\Behat\API\Context\ContentTypeContext
-                - EzSystems\Behat\API\Context\RoleContext
-                - EzSystems\Behat\API\Context\TestContext
-                - EzSystems\Behat\API\Context\TrashContext
-                - EzSystems\Behat\API\Context\UserContext
                 - Ibexa\AdminUi\Behat\BrowserContext\AdminUpdateContext
                 - Ibexa\AdminUi\Behat\BrowserContext\BookmarkContext
+                - Ibexa\AdminUi\Behat\BrowserContext\ContentActionsMenuContext
                 - Ibexa\AdminUi\Behat\BrowserContext\ContentPreviewContext
                 - Ibexa\AdminUi\Behat\BrowserContext\ContentTypeContext
                 - Ibexa\AdminUi\Behat\BrowserContext\ContentUpdateContext
                 - Ibexa\AdminUi\Behat\BrowserContext\ContentViewContext
                 - Ibexa\AdminUi\Behat\BrowserContext\DashboardContext
                 - Ibexa\AdminUi\Behat\BrowserContext\LanguageContext
-                - Ibexa\AdminUi\Behat\BrowserContext\LeftMenuContext
                 - Ibexa\AdminUi\Behat\BrowserContext\NavigationContext
                 - Ibexa\AdminUi\Behat\BrowserContext\NotificationContext
                 - Ibexa\AdminUi\Behat\BrowserContext\ObjectStatesContext
-                - Ibexa\AdminUi\Behat\BrowserContext\RightMenuContext
                 - Ibexa\AdminUi\Behat\BrowserContext\RolesContext
                 - Ibexa\AdminUi\Behat\BrowserContext\SearchContext
                 - Ibexa\AdminUi\Behat\BrowserContext\SectionsContext
@@ -68,25 +65,38 @@ regression:
                 - Ibexa\AdminUi\Behat\BrowserContext\UDWContext
                 - Ibexa\AdminUi\Behat\BrowserContext\UserNotificationContext
                 - Ibexa\AdminUi\Behat\BrowserContext\UserPreferencesContext
+                - Ibexa\Behat\API\Context\ContentContext
+                - Ibexa\Behat\API\Context\ContentTypeContext
+                - Ibexa\Behat\API\Context\RoleContext
+                - Ibexa\Behat\API\Context\TestContext
+                - Ibexa\Behat\API\Context\TrashContext
+                - Ibexa\Behat\API\Context\UserContext
                 - Ibexa\Behat\Browser\Context\AuthenticationContext
                 - Ibexa\Behat\Browser\Context\DebuggingContext
-                - Ibexa\Commerce\ShopTools\Behat\Context\CheckoutContext
-                - Ibexa\Commerce\ShopTools\Behat\Context\ConfigurationSettingsContext
-                - Ibexa\Commerce\ShopTools\Behat\Context\FrontContext
-                - Ibexa\Commerce\ShopTools\Behat\Context\ManageAddressContext
-                - Ibexa\Commerce\ShopTools\Behat\Context\ProductVariantContext
-                - Ibexa\Commerce\ShopTools\Behat\Context\UserRegistrationContext
+                - Ibexa\CorporateAccount\Behat\Context\CompaniesContext
                 - Ibexa\FieldTypePage\Behat\Context\BlockHideEventsSourceContext
                 - Ibexa\FieldTypePage\Behat\Context\BlockRevealEventsSourceContext
                 - Ibexa\FormBuilder\Behat\BrowserContext\FormAdministrationContext
                 - Ibexa\FormBuilder\Behat\BrowserContext\FormBuilderContext
                 - Ibexa\FormBuilder\Behat\BrowserContext\FormFieldConfigurationContext
                 - Ibexa\FormBuilder\Behat\BrowserContext\FormFrontContext
+                - Ibexa\Migration\Behat\Context\MigrationContext
                 - Ibexa\PageBuilder\Behat\Context\PageBuilderContext
+                - Ibexa\Payment\Behat\Context\PaymentMethodsContext
+                - Ibexa\ProductCatalog\Behat\Context\AttributeGroupsContext
+                - Ibexa\ProductCatalog\Behat\Context\AttributesContext
+                - Ibexa\ProductCatalog\Behat\Context\CatalogsContext
+                - Ibexa\ProductCatalog\Behat\Context\CurrenciesContext
+                - Ibexa\ProductCatalog\Behat\Context\CustomerGroupsContext
+                - Ibexa\ProductCatalog\Behat\Context\ProductsContext
+                - Ibexa\ProductCatalog\Behat\Context\ProductTypesContext
                 - Ibexa\Scheduler\Behat\BrowserContext\DateBasedPublisherContext
+                - Ibexa\Segmentation\Behat\Context\SegmentationContext
+                - Ibexa\Segmentation\Behat\Context\SegmentationContext
+                - Ibexa\Taxonomy\Behat\Context\Browser\TaxonomyContext
+                - Ibexa\Taxonomy\Behat\Context\Service\TaxonomyContext
                 - Ibexa\User\Behat\Context\UserSettingsContext
                 - Ibexa\User\Behat\Context\UserSetupContext
                 - Ibexa\VersionComparison\Behat\Context\VersionComparisonContext
                 - Ibexa\Workflow\Behat\Context\WorkflowAdminContext
                 - Ibexa\Workflow\Behat\Context\WorkflowContext
-                - Ibexa\Segmentation\Behat\Context\SegmentationContext