Merge pull request #54 from PrestaShop/branch-82x

Acknowledge PS 8.2.x - copy of #53
PrestaShop · Aug 28, 2024 · 1ea2809 · 1ea2809
2 parents cffa93c + 4c67be1
commit 1ea2809
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/PullRequest/Domain/Aggregate/PullRequest/PullRequest.php b/src/PullRequest/Domain/Aggregate/PullRequest/PullRequest.php
@@ -102,6 +102,7 @@ public function addLabelsByDescription(PullRequestDescription $description): voi
         $this->labels = array_diff($this->labels, [
             'develop',
             '8.1.x',
+            '8.2.x',
             'Bug fix',
             'Improvement',
             'Feature',

diff --git a/src/PullRequest/Domain/Aggregate/PullRequest/PullRequestDescription.php b/src/PullRequest/Domain/Aggregate/PullRequest/PullRequestDescription.php
@@ -8,7 +8,7 @@
 
 class PullRequestDescription
 {
-    public const TARGET_BRANCH_AVAILABLE = ['develop', '8.1.x'];
+    public const TARGET_BRANCH_AVAILABLE = ['develop', '8.1.x', '8.2.x'];
     public const TEMPLATE_DESCRIPTION = 'Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.';
     public const TYPES_AVAILABLE = ['bug fix', 'improvement', 'new feature', 'refacto'];
     public const CATEGORIES_AVAILABLE = ['FO', 'BO', 'CO', 'IN', 'WS', 'TE', 'LO', 'ME', 'PM'];
@@ -20,7 +20,7 @@ public function __construct(
     ) {
     }
 
-    #[Assert\NotBlank(message: 'The `branch` should be `develop` or `8.1.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))')]
+    #[Assert\NotBlank(message: 'The `branch` should be `develop` or `8.2.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))')]
     public function getBranch(): ?string
     {
         $branch = $this->extractWithRegex('Branch');

diff --git a/tests/PullRequest/Application/CommandHandler/CheckTableDescriptionCommandHandlerTest.php b/tests/PullRequest/Application/CommandHandler/CheckTableDescriptionCommandHandlerTest.php
@@ -111,7 +111,7 @@ public static function provideTestHandle(): array
                 ),
                 '',
                 [
-                    'The `branch` should be `develop` or `8.1.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
+                    'The `branch` should be `develop` or `8.2.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
                     "The `description` shouldn't be empty. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#description))",
                     'The `type` should be one of these: `new feature`, `improvement`, `bug fix` or `refacto`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
                     'The `category` should be one of these: `FO`, `BO`, `CO`, `IN`, `WS`, `TE`, `LO`, `ME` or `PM`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
@@ -133,7 +133,7 @@ public static function provideTestHandle(): array
                 "
 | Questions         | Answers
 | ----------------- | -------------------------------------------------------
-| Branch?           | develop / 8.1.x
+| Branch?           | develop / 8.2.x
 | Description?      | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
 | Type?             | bug fix / improvement / new feature / refacto
 | Category?         | FO / BO / CO / IN / WS / TE / LO / ME / PM / see explanations at https://devdocs.prestashop-project.org/8/contribute/contribution-guidelines/pull-requests/#type--category
@@ -146,7 +146,7 @@ public static function provideTestHandle(): array
 | Sponsor company   | Your company or customer's name goes here (if applicable).
 ",
                 [
-                    'The `branch` should be `develop` or `8.1.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
+                    'The `branch` should be `develop` or `8.2.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
                     "The `description` shouldn't be empty. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#description))",
                     'The `type` should be one of these: `new feature`, `improvement`, `bug fix` or `refacto`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
                     'The `category` should be one of these: `FO`, `BO`, `CO`, `IN`, `WS`, `TE`, `LO`, `ME` or `PM`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))',
@@ -166,7 +166,7 @@ public static function provideTestHandle(): array
                     pullRequestNumber: 'fake'
                 ),
                 '| Branch?           | fake',
-                ['The `branch` should be `develop` or `8.1.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))'],
+                ['The `branch` should be `develop` or `8.2.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))'],
                 [],
                 false,
                 true,
@@ -180,7 +180,7 @@ public static function provideTestHandle(): array
                 ),
                 '| Branch?           | develop',
                 [],
-                ['The `branch` should be `develop` or `8.1.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))'],
+                ['The `branch` should be `develop` or `8.2.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))'],
                 false,
                 true,
                 ['develop'],
@@ -191,12 +191,12 @@ public static function provideTestHandle(): array
                     repositoryName: 'PrestaShop',
                     pullRequestNumber: 'fake'
                 ),
-                '| Branch?           | 8.1.x',
+                '| Branch?           | 8.2.x',
                 [],
-                ['The `branch` should be `develop` or `8.1.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))'],
+                ['The `branch` should be `develop` or `8.2.x`. ([Read explanation](https://devdocs.prestashop-project.org/9/contribute/contribution-guidelines/pull-requests/#branch))'],
                 false,
                 true,
-                ['8.1.x'],
+                ['8.2.x'],
             ],
             [
                 new PullRequestId(

diff --git a/tests/Shared/Infrastructure/Provider/TranslationsCatalogProviderTest.php b/tests/Shared/Infrastructure/Provider/TranslationsCatalogProviderTest.php
@@ -97,7 +97,7 @@ public static function provideTestGetCatalogVersionByPullRequest(): array
                     ),
                     labels: ['label'],
                     approvals: [],
-                    targetBranch: '8.1.X'
+                    targetBranch: '8.2.X'
                 ),
                 8,
             ],
@@ -110,7 +110,7 @@ public static function provideTestGetCatalogVersionByPullRequest(): array
                     ),
                     labels: ['label'],
                     approvals: [],
-                    targetBranch: '8.1.X'
+                    targetBranch: '8.2.X'
                 ),
                 9,
             ],