diff --git a/.github/workflows/ci_e2e-pgsql.yaml b/.github/workflows/ci_e2e-pgsql.yaml index 1b90adaf38..6a43616158 100644 --- a/.github/workflows/ci_e2e-pgsql.yaml +++ b/.github/workflows/ci_e2e-pgsql.yaml @@ -24,8 +24,17 @@ jobs: outputs: matrix: ${{ steps.matrix.outputs.prop }} steps: - - uses: actions/checkout@v4 - - name: "Get matrix" + - name: "Checkout (With Branch)" + if: "${{ inputs.branch != '' }}" + uses: actions/checkout@v4 + with: + ref: ${{ inputs.branch }} + + - name: "Checkout" + uses: actions/checkout@v4 + if: "${{ inputs.branch == '' }}" + - + name: "Get matrix" id: matrix uses: notiz-dev/github-action-json-property@release with: diff --git a/src/Sylius/Bundle/ApiBundle/Filter/Doctrine/PromotionCouponPromotionFilter.php b/src/Sylius/Bundle/ApiBundle/Filter/Doctrine/PromotionCouponPromotionFilter.php index c41259a9b5..068b14f954 100644 --- a/src/Sylius/Bundle/ApiBundle/Filter/Doctrine/PromotionCouponPromotionFilter.php +++ b/src/Sylius/Bundle/ApiBundle/Filter/Doctrine/PromotionCouponPromotionFilter.php @@ -23,6 +23,14 @@ use Psr\Log\LoggerInterface; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\Serializer\NameConverter\NameConverterInterface; +trigger_deprecation( + 'sylius/api-bundle', + '1.14', + 'The "%s" class is deprecated and will be removed in Sylius 2.0. Starting with this version, promotion coupon collection will be filtered by promotion code, using API Platform search filter.', + PromotionCouponPromotionFilter::class +); + +/** @deprecated since Sylius 1.14 and will be removed in Sylius 2.0. */ final class PromotionCouponPromotionFilter extends AbstractContextAwareFilter { public const PROPERTY = 'promotion'; diff --git a/src/Sylius/Bundle/CoreBundle/Console/Command/InformAboutGUSCommand.php b/src/Sylius/Bundle/CoreBundle/Console/Command/InformAboutGUSCommand.php index f69795f26d..dc5b4a48f5 100644 --- a/src/Sylius/Bundle/CoreBundle/Console/Command/InformAboutGUSCommand.php +++ b/src/Sylius/Bundle/CoreBundle/Console/Command/InformAboutGUSCommand.php @@ -31,22 +31,9 @@ final class InformAboutGUSCommand extends Command { $style = new SymfonyStyle($input, $output); - $style->note( - [ - 'For purely statistical purposes and in order to inform you about important updates and security patches, Sylius might send non-sensitive data to our servers. We send:', - '* Hostname', - '* User-agent', - '* Locale', - '* Environment (test, dev or prod)', - '* Currently used Sylius version', - '* Date of the last contact', - 'If you do not consent please follow this cookbook article:', - 'https://docs.sylius.com/en/latest/cookbook/configuration/disabling-admin-notifications.html', - 'That being said, every time we get a notification about a new site deployed with Sylius, it brings a huge smile to our faces and motivates us to continue our Open Source work.', - ], - ); + $style->info('To inform you about important updates and security patches, Sylius might send non-sensitive data(hostname, user-agent, locale, environment [prod/dev/test]), Sylius version, date of last contact) to our servers. An instruction on how to withdraw consent to this data collection is available in the Sylius documentation.'); - return 0; + return Command::SUCCESS; } }