Skip to content

Commit

Permalink
Merge branch '1.12' into 1.13
Browse files Browse the repository at this point in the history
* 1.12:
  [Composer] Explicitly add a dependency to StateMachineAbstraction
  [Composer] Bump up minimum PHP version
  [Composer] Bump up PayPalPlugin dependency
  • Loading branch information
GSadee committed Jun 18, 2024
2 parents b71567a + a109c43 commit aa77509
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 24 deletions.
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"friends-of-behat/symfony-extension": "^2.1",
"friends-of-behat/variadic-extension": "^1.3",
"lchrusciel/api-test-case": "^5.0",
"nyholm/psr7": "^1.8",
"phpspec/phpspec": "^7.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^1.8.4",
Expand All @@ -60,6 +61,7 @@
"sylius/sylius-rector": "^2.0",
"symfony/browser-kit": "^5.4 || ^6.4",
"symfony/debug-bundle": "^5.4 || ^6.4",
"symfony/http-client": "^5.4 || ^6.4",
"symfony/intl": "^5.4 || ^6.4",
"symfony/web-profiler-bundle": "^5.4 || ^6.4"
},
Expand All @@ -75,7 +77,7 @@
"allow-plugins": {
"symfony/flex": true,
"dealerdirect/phpcodesniffer-composer-installer": false,
"php-http/discovery": true,
"php-http/discovery": false,
"phpstan/extension-installer": false,
"symfony/thanks": false,
"symfony/runtime": true
Expand Down
10 changes: 10 additions & 0 deletions config/packages/http_discovery.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:
Psr\Http\Message\RequestFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\ResponseFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\ServerRequestFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\StreamFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\UploadedFileFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\UriFactoryInterface: '@http_discovery.psr17_factory'

http_discovery.psr17_factory:
class: Http\Discovery\Psr17Factory
11 changes: 0 additions & 11 deletions config/packages/nyholm_psr7.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,6 @@
"sebastian/recursion-context": {
"version": "3.0.0"
},
"sebastian/resource-operations": {
"version": "1.0.0"
},
"sebastian/type": {
"version": "1.1.3"
},
Expand Down Expand Up @@ -545,15 +542,6 @@
"sylius/resource-bundle": {
"version": "v1.4.4"
},
"sylius/state-machine-abstraction": {
"version": "1.13",
"recipe": {
"repo": "github.com/Sylius/SyliusRecipes",
"branch": "main",
"version": "1.13",
"ref": "d538f7c966e2d796543c3be72cb65072bf74504e"
}
},
"sylius/sylius": {
"version": "1.13",
"recipe": {
Expand Down

0 comments on commit aa77509

Please sign in to comment.