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.

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 #227

Merged
merged 102 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
f1b913c
build(deps-dev): bump phpstan/phpstan from 1.10.65 to 1.10.66
dependabot[bot] Apr 1, 2024
fe6af2a
build(deps-dev): bump phpunit/phpunit from 11.0.8 to 11.0.9
dependabot[bot] Apr 1, 2024
7a3d7fc
Merge pull request #174 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Apr 1, 2024
273aca8
Merge pull request #175 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Apr 1, 2024
a048117
build(deps-dev): bump symfony/maker-bundle from 1.57.0 to 1.58.0
dependabot[bot] Apr 8, 2024
43f1670
build(deps-dev): bump symfony/phpunit-bridge from 7.0.4 to 7.0.6
dependabot[bot] Apr 8, 2024
2202059
build(deps): bump symfony/console from 7.0.4 to 7.0.6
dependabot[bot] Apr 8, 2024
62cf75c
build(deps): bump symfony/framework-bundle from 7.0.4 to 7.0.6
dependabot[bot] Apr 8, 2024
d8d0a73
build(deps-dev): bump phpunit/phpunit from 11.0.9 to 11.1.1
dependabot[bot] Apr 8, 2024
72faf61
Merge pull request #180 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Apr 8, 2024
2ad256a
Merge pull request #179 from PrestaShop/dependabot/composer/develop/s…
nicosomb Apr 8, 2024
7524bbb
Merge pull request #177 from PrestaShop/dependabot/composer/develop/s…
nicosomb Apr 8, 2024
7151160
Merge pull request #178 from PrestaShop/dependabot/composer/develop/s…
nicosomb Apr 8, 2024
e4535a7
Merge pull request #176 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Apr 8, 2024
7f6bbb7
build(deps-dev): bump phpunit/phpunit from 11.1.1 to 11.1.2
dependabot[bot] Apr 15, 2024
b4b2bfc
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.52.1 to 3.53.0
dependabot[bot] Apr 15, 2024
e5e98a2
Merge pull request #182 from PrestaShop/dependabot/composer/develop/f…
Progi1984 Apr 15, 2024
386bccc
Merge pull request #181 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Apr 15, 2024
b269fdf
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.53.0 to 3.54.0
dependabot[bot] Apr 22, 2024
ba0b4ab
build(deps): bump doctrine/orm from 3.1.1 to 3.1.2
dependabot[bot] Apr 22, 2024
9a227cc
build(deps-dev): bump phpstan/phpstan from 1.10.66 to 1.10.67
dependabot[bot] Apr 22, 2024
dd14ecc
Merge pull request #185 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Apr 22, 2024
9dc25f3
Merge pull request #184 from PrestaShop/dependabot/composer/develop/d…
Progi1984 Apr 22, 2024
da11767
Merge pull request #183 from PrestaShop/dependabot/composer/develop/f…
Progi1984 Apr 22, 2024
4298cde
build(deps-dev): bump symfony/maker-bundle from 1.58.0 to 1.59.0
dependabot[bot] Apr 29, 2024
53b29f8
build(deps-dev): bump phpunit/phpunit from 11.1.2 to 11.1.3
dependabot[bot] Apr 29, 2024
51425ac
Merge pull request #186 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Apr 29, 2024
4505a4d
Merge pull request #187 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Apr 29, 2024
31d8493
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.54.0 to 3.55.0
dependabot[bot] May 6, 2024
e4b9bd4
build(deps-dev): bump symfony/browser-kit from 7.0.3 to 7.0.7
dependabot[bot] May 6, 2024
5947089
build(deps): bump doctrine/orm from 3.1.2 to 3.1.3
dependabot[bot] May 6, 2024
9f29aba
build(deps): bump symfony/dotenv from 7.0.4 to 7.0.7
dependabot[bot] May 6, 2024
0c27fbc
build(deps): bump symfony/runtime from 7.0.3 to 7.0.7
dependabot[bot] May 6, 2024
55ab0c4
Merge pull request #188 from PrestaShop/dependabot/composer/develop/f…
nicosomb May 6, 2024
5c82b19
build(deps-dev): bump symfony/phpunit-bridge from 7.0.6 to 7.0.7
dependabot[bot] May 6, 2024
3f9948d
Merge pull request #189 from PrestaShop/dependabot/composer/develop/s…
Progi1984 May 6, 2024
f524300
Merge pull request #191 from PrestaShop/dependabot/composer/develop/s…
Progi1984 May 6, 2024
f6932c5
build(deps-dev): bump symfony/maker-bundle from 1.59.0 to 1.59.1
dependabot[bot] May 6, 2024
46e5c19
build(deps-dev): bump symfony/css-selector from 7.0.3 to 7.0.7
dependabot[bot] May 6, 2024
18cceb1
Merge pull request #197 from PrestaShop/dependabot/composer/develop/s…
Progi1984 May 6, 2024
dfcd09b
Merge pull request #192 from PrestaShop/dependabot/composer/develop/s…
Progi1984 May 6, 2024
3b540bd
Merge pull request #193 from PrestaShop/dependabot/composer/develop/d…
Progi1984 May 6, 2024
1629006
Merge pull request #194 from PrestaShop/dependabot/composer/develop/s…
Progi1984 May 6, 2024
ff2ad61
Merge pull request #196 from PrestaShop/dependabot/composer/develop/s…
Progi1984 May 6, 2024
708a6f5
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.55.0 to 3.56.1
dependabot[bot] May 13, 2024
48f2732
build(deps): bump symfony/yaml from 7.0.3 to 7.0.7
dependabot[bot] May 13, 2024
11a587c
Merge pull request #199 from PrestaShop/dependabot/composer/develop/s…
nicosomb May 13, 2024
9180563
Merge pull request #198 from PrestaShop/dependabot/composer/develop/f…
nicosomb May 13, 2024
14a8437
build(deps-dev): bump phpstan/phpstan from 1.10.67 to 1.11.1
dependabot[bot] May 20, 2024
1cf0e4e
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.56.1 to 3.57.1
dependabot[bot] May 20, 2024
420878a
build(deps): bump doctrine/doctrine-migrations-bundle
dependabot[bot] May 20, 2024
c5e01e7
Merge pull request #202 from PrestaShop/dependabot/composer/develop/d…
nicosomb May 20, 2024
b92d816
Merge pull request #201 from PrestaShop/dependabot/composer/develop/f…
nicosomb May 20, 2024
ef72704
Merge pull request #200 from PrestaShop/dependabot/composer/develop/p…
nicosomb May 20, 2024
7d94e6d
build(deps-dev): bump phpstan/phpstan from 1.11.1 to 1.11.2
dependabot[bot] May 27, 2024
d79dda1
build(deps): bump doctrine/orm from 3.1.3 to 3.2.0
dependabot[bot] May 27, 2024
9df4fb2
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.57.1 to 3.57.2
dependabot[bot] May 27, 2024
09b27eb
Merge pull request #205 from PrestaShop/dependabot/composer/develop/f…
nicosomb May 27, 2024
a55000d
Merge pull request #204 from PrestaShop/dependabot/composer/develop/d…
nicosomb May 27, 2024
edffcfc
Merge pull request #203 from PrestaShop/dependabot/composer/develop/p…
nicosomb May 27, 2024
fb59d94
build(deps): bump symfony/console from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
0ba6a14
Merge pull request #215 from PrestaShop/dependabot/composer/develop/s…
nicosomb Jun 3, 2024
7c883af
build(deps-dev): bump symfony/browser-kit from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
67190bb
Merge pull request #208 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 3, 2024
db9fbca
build(deps): bump symfony/dotenv from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
4e702ea
build(deps-dev): bump phpstan/phpstan from 1.11.2 to 1.11.3
dependabot[bot] Jun 3, 2024
9b9d054
Merge pull request #206 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Jun 3, 2024
131346e
Merge pull request #207 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 3, 2024
7c93d4c
build(deps): bump symfony/runtime from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
5738391
Merge pull request #209 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 3, 2024
6e14859
build(deps-dev): bump symfony/css-selector from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
4b8f5be
Merge pull request #213 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 3, 2024
fb8b30b
build(deps-dev): bump symfony/phpunit-bridge from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
e518171
build(deps): bump symfony/yaml from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
ba2c954
Merge pull request #214 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 3, 2024
3c0f5a3
Merge pull request #211 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 3, 2024
9e7a93a
build(deps): bump symfony/framework-bundle from 7.0.7 to 7.1.0
dependabot[bot] Jun 3, 2024
b6bb0b2
Merge pull request #210 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 3, 2024
1f6c3e9
build(deps-dev): bump friendsofphp/php-cs-fixer from 3.57.2 to 3.58.1
dependabot[bot] Jun 3, 2024
a773d9c
Merge pull request #212 from PrestaShop/dependabot/composer/develop/f…
Progi1984 Jun 3, 2024
e9ab4a2
build(deps): bump symfony/dotenv from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
e1b6702
build(deps): bump symfony/console from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
9ddceaa
build(deps): bump symfony/yaml from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
3a63b6a
build(deps-dev): bump symfony/phpunit-bridge from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
ba8d49d
build(deps): bump symfony/runtime from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
ba74c18
build(deps-dev): bump symfony/css-selector from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
22609b2
build(deps-dev): bump phpunit/phpunit from 11.1.3 to 11.2.0
dependabot[bot] Jun 10, 2024
4686809
build(deps-dev): bump symfony/browser-kit from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
30155c9
build(deps-dev): bump phpstan/phpstan from 1.11.3 to 1.11.4
dependabot[bot] Jun 10, 2024
4c4b5ef
Merge pull request #226 from PrestaShop/dependabot/composer/develop/p…
nicosomb Jun 10, 2024
736654a
Merge pull request #217 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
eca844f
Merge pull request #218 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
0c3a1b1
Merge pull request #219 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
bbaf41f
Merge pull request #220 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
0207ffb
Merge pull request #221 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
2152da1
Merge pull request #222 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
f63a736
Merge pull request #223 from PrestaShop/dependabot/composer/develop/p…
Progi1984 Jun 10, 2024
958fffc
Merge pull request #225 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
9467106
build(deps): bump symfony/framework-bundle from 7.1.0 to 7.1.1
dependabot[bot] Jun 10, 2024
00fd692
Merge pull request #224 from PrestaShop/dependabot/composer/develop/s…
Progi1984 Jun 10, 2024
9434424
API Nightly : Support for database
Progi1984 Jun 4, 2024
135c93e
Merge pull request #216 from PrestaShop/addDB
Progi1984 Jun 13, 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
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
"doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "^3.1",
"symfony/apache-pack": "^1.0",
"symfony/console": "~7.0.0",
"symfony/dotenv": "~7.0.0",
"symfony/console": "~7.1.0",
"symfony/dotenv": "~7.1.0",
"symfony/flex": "^2",
"symfony/framework-bundle": "~7.0.0",
"symfony/runtime": "~7.0.0",
"symfony/yaml": "~7.0.0"
"symfony/framework-bundle": "~7.1.0",
"symfony/runtime": "~7.1.0",
"symfony/yaml": "~7.1.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.41",
"friendsofphp/php-cs-fixer": "^3.45",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^11.0",
"symfony/browser-kit": "~7.0.0",
"symfony/css-selector": "~7.0.0",
"symfony/browser-kit": "~7.1.0",
"symfony/css-selector": "~7.1.0",
"symfony/maker-bundle": "^1.52",
"symfony/phpunit-bridge": "^7.0"
},
Expand Down
Loading
Loading