Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #173

Merged
merged 53 commits into from
Mar 26, 2024
Merged

Merge develop into master #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
a1a839b
build(deps): bump doctrine/orm from 2.18.0 to 2.18.1
dependabot[bot] Feb 26, 2024
cd42267
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.49.0 to 3.50.0
dependabot[bot] Feb 26, 2024
f3c4404
build(deps-dev): bump phpstan/phpstan from 1.10.58 to 1.10.59
dependabot[bot] Feb 26, 2024
5f75a82
build(deps-dev): bump symfony/maker-bundle from 1.54.0 to 1.55.1
dependabot[bot] Feb 26, 2024
ad039c5
Merge pull request #149 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Feb 26, 2024
b4b3b20
Merge pull request #148 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Feb 26, 2024
d16b2d6
Merge pull request #147 from PrestaShop/dependabot/composer/develop/f…
Progi1984 Feb 26, 2024
a5593ce
Merge pull request #146 from PrestaShop/dependabot/composer/develop/d…
Progi1984 Feb 26, 2024
0a5a4e9
build(deps-dev): bump phpunit/phpunit from 10.5.10 to 11.0.3
dependabot[bot] Feb 26, 2024
b8b8c1b
Merge pull request #150 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Feb 26, 2024
9aef5b6
build(deps-dev): bump symfony/phpunit-bridge from 7.0.3 to 7.0.4
dependabot[bot] Mar 4, 2024
e8c5801
build(deps): bump symfony/flex from 2.4.4 to 2.4.5
dependabot[bot] Mar 4, 2024
8f5a827
build(deps): bump symfony/dotenv from 7.0.3 to 7.0.4
dependabot[bot] Mar 4, 2024
8c8faa1
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.50.0 to 3.51.0
dependabot[bot] Mar 4, 2024
7a9c4da
build(deps): bump doctrine/orm from 2.18.1 to 2.19.0
dependabot[bot] Mar 4, 2024
ec43a0f
Merge pull request #151 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Mar 4, 2024
6b170ed
Merge pull request #152 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Mar 4, 2024
42449cb
build(deps): bump symfony/framework-bundle from 7.0.3 to 7.0.4
dependabot[bot] Mar 4, 2024
6ace7fc
Merge pull request #153 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Mar 4, 2024
2d3f506
Merge pull request #159 from PrestaShop/dependabot/composer/develop/d…
Progi1984 Mar 4, 2024
40add04
build(deps-dev): bump phpunit/phpunit from 11.0.3 to 11.0.4
dependabot[bot] Mar 4, 2024
dc13e1a
Merge pull request #158 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Mar 4, 2024
95b0425
Merge pull request #154 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Mar 4, 2024
40fa85b
build(deps): bump beberlei/doctrineextensions from 1.4.0 to 1.5.0
dependabot[bot] Mar 4, 2024
d41948f
Merge pull request #156 from PrestaShop/dependabot/composer/develop/f…
Progi1984 Mar 4, 2024
77137fc
Merge pull request #157 from PrestaShop/dependabot/composer/develop/b…
Progi1984 Mar 4, 2024
073a220
build(deps-dev): bump phpstan/phpstan from 1.10.59 to 1.10.60
dependabot[bot] Mar 11, 2024
337912e
build(deps-dev): bump phpunit/phpunit from 11.0.4 to 11.0.5
dependabot[bot] Mar 11, 2024
681a791
build(deps): bump doctrine/orm from 2.19.0 to 3.1.0
dependabot[bot] Mar 11, 2024
1ab38f3
build(deps-dev): bump symfony/maker-bundle from 1.55.1 to 1.56.0
dependabot[bot] Mar 11, 2024
c325c90
Merge pull request #160 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Mar 11, 2024
da2ccd2
Merge pull request #161 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Mar 11, 2024
5f1f681
Merge pull request #162 from PrestaShop/dependabot/composer/develop/d…
Progi1984 Mar 11, 2024
b48f799
Merge pull request #163 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Mar 11, 2024
f847d5b
build(deps-dev): bump phpstan/phpstan from 1.10.60 to 1.10.62
dependabot[bot] Mar 18, 2024
347b86b
build(deps-dev): bump phpunit/phpunit from 11.0.5 to 11.0.6
dependabot[bot] Mar 18, 2024
4181285
Merge pull request #165 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Mar 18, 2024
9c93806
Merge pull request #164 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Mar 18, 2024
1f6badc
build(deps-dev): bump phpstan/phpstan from 1.10.62 to 1.10.65
dependabot[bot] Mar 25, 2024
a6ac163
build(deps-dev): bump symfony/maker-bundle from 1.56.0 to 1.57.0
dependabot[bot] Mar 25, 2024
c168e02
build(deps): bump doctrine/orm from 3.1.0 to 3.1.1
dependabot[bot] Mar 25, 2024
dd987aa
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.51.0 to 3.52.1
dependabot[bot] Mar 25, 2024
2c5c25e
Merge pull request #171 from PrestaShop/dependabot/composer/develop/f…
Progi1984 Mar 25, 2024
9d07c30
Merge pull request #170 from PrestaShop/dependabot/composer/develop/d…
Progi1984 Mar 25, 2024
b6861d3
Merge pull request #169 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Mar 25, 2024
a8aa961
Merge pull request #168 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Mar 25, 2024
457fd23
build(deps): bump doctrine/doctrine-bundle from 2.11.3 to 2.12.0
dependabot[bot] Mar 25, 2024
6ee457f
Merge pull request #167 from PrestaShop/dependabot/composer/develop/d…
Progi1984 Mar 25, 2024
3ee8a2b
build(deps-dev): bump phpunit/phpunit from 11.0.6 to 11.0.8
dependabot[bot] Mar 25, 2024
b5ad85e
Merge pull request #166 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Mar 25, 2024
d3fe49e
Endpoint `/import/report/playwright` : Restrict the campaign
Progi1984 Mar 26, 2024
f2708dc
Fixed "Metadata in doc-comments is deprecated and will no longer be s…
Progi1984 Mar 26, 2024
789acf1
Merge pull request #172 from PrestaShop/restrictCampaign
Progi1984 Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"beberlei/doctrineextensions": "^1.3",
"doctrine/doctrine-bundle": "^2.11",
"doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "^2.17",
"doctrine/orm": "^3.1",
"symfony/apache-pack": "^1.0",
"symfony/console": "~7.0.0",
"symfony/dotenv": "~7.0.0",
Expand All @@ -23,7 +23,7 @@
"ergebnis/composer-normalize": "^2.41",
"friendsofphp/php-cs-fixer": "^3.45",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^10.5",
"phpunit/phpunit": "^11.0",
"symfony/browser-kit": "~7.0.0",
"symfony/css-selector": "~7.0.0",
"symfony/maker-bundle": "^1.52",
Expand Down
Loading
Loading