mirror of
https://github.com/Sylius/Sylius.git
synced 2026-07-14 09:02:12 +00:00
[UPMERGE] 1.14 -> 2.0 (#16657)
This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout <this-pr-number> git merge upstream/2.0 -m "Resolve conflicts between 1.14 and 2.0" ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
This commit is contained in:
commit
bb0bc58ce1
3 changed files with 21 additions and 17 deletions
13
.github/workflows/ci_e2e-pgsql.yaml
vendored
13
.github/workflows/ci_e2e-pgsql.yaml
vendored
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue