Skip to content

Commit 0a3ffcf

Browse files
loic425loic425
committed
Bump dependencies
1 parent d4457c6 commit 0a3ffcf

32 files changed

+116
-242
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,19 @@ on:
1313
jobs:
1414
tests:
1515
runs-on: ubuntu-latest
16-
name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, Persistence: ${{ matrix.persistence }}, Collections: ${{ matrix.collections }}"
16+
name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}"
1717
env:
1818
APP_ENV: ${{ matrix.app_env }}
1919
strategy:
2020
fail-fast: false
2121
matrix:
2222
php: ["8.1", "8.2", "8.3"]
23-
pagerfanta: [""]
24-
symfony: ["^5.4", "^6.4"]
25-
persistence: ["^2.0", "^3.0"]
26-
collections: ["^1.8", "^2.0"]
23+
composer-flags: ['--no-scripts --prefer-stable --prefer-dist']
24+
symfony: ["^6.4", "^7.1"]
2725
app_env: ["test"]
28-
include:
29-
- php: "8.1"
30-
pagerfanta: "^3.7"
31-
symfony: "^5.4"
32-
app_env: "test"
33-
- php: "8.3"
34-
symfony: "^7.0"
35-
app_env: "test_without_hateoas"
3626
exclude:
3727
- php: "8.1"
38-
collections: "^2.0"
39-
persistence: "^2.0"
40-
- php: "8.2"
41-
collections: "^2.0"
42-
persistence: "^2.0"
43-
- php: "8.3"
44-
collections: "^2.0"
45-
persistence: "^2.0"
46-
- persistence: "^2.0"
47-
symfony: "^6.4"
28+
symfony: "^7.1"
4829

4930
steps:
5031
-
@@ -66,24 +47,6 @@ jobs:
6647
composer config extra.symfony.require "${{ matrix.symfony }}"
6748
(cd src/Component && composer config extra.symfony.require "${{ matrix.symfony }}")
6849
69-
-
70-
name: Restrict Pagerfanta version
71-
if: matrix.pagerfanta != ''
72-
run: |
73-
composer require "babdev/pagerfanta-bundle:${{ matrix.pagerfanta }}" --no-update --no-scripts
74-
composer require "pagerfanta/pagerfanta:${{ matrix.pagerfanta }}" --dev --no-update --no-scripts
75-
(cd src/Component && composer require "pagerfanta/core:${{ matrix.pagerfanta }}" --no-update --no-scripts)
76-
77-
-
78-
name: Restrict doctrine/persistence version
79-
if: matrix.persistence != ''
80-
run: composer require "doctrine/persistence:${{ matrix.persistence }}" --no-update --no-scripts
81-
82-
-
83-
name: Restrict doctrine/collections version
84-
if: matrix.collections != ''
85-
run: composer require "doctrine/collections:${{ matrix.collections }}" --no-update --no-scripts
86-
8750
-
8851
name: Remove hateoas on Symfony 7
8952
if: matrix.symfony == '^7.0'
@@ -93,7 +56,7 @@ jobs:
9356
name: Install dependencies
9457
run: |
9558
composer update --no-scripts
96-
(cd src/Component && composer update --no-scripts)
59+
(cd src/Component && composer update ${{ matrix.composer-flags }})
9760
9861
-
9962
name: Prepare test application

‎composer.json‎

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -26,74 +26,75 @@
2626
],
2727
"require": {
2828
"php": "^8.1",
29-
"babdev/pagerfanta-bundle": "^3.7 || ^4.0",
29+
"babdev/pagerfanta-bundle": "^4.4",
3030
"doctrine/annotations": "^2.0",
31-
"doctrine/collections": "^1.8 || ^2.0",
31+
"doctrine/collections": "^2.2",
3232
"doctrine/event-manager": "^1.1 || ^2.0",
33-
"doctrine/inflector": "^1.4 || ^2.0",
34-
"doctrine/persistence": "^2.0 || ^3.0",
35-
"gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
33+
"doctrine/inflector": "^2.0",
34+
"doctrine/persistence": "^3.3",
35+
"gedmo/doctrine-extensions": "^3.17.1",
3636
"sylius/registry": "^1.2",
37-
"symfony/config": "^5.4 || ^6.4 || ^7.0",
38-
"symfony/deprecation-contracts": "^2.1 || ^3.0",
39-
"symfony/expression-language": "^5.4 || ^6.4 || ^7.0",
40-
"symfony/form": "^5.4 || ^6.4 || ^7.0",
41-
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
42-
"symfony/http-foundation": "^5.4 || ^6.4 || ^7.0",
43-
"symfony/intl": "^5.4 || ^6.4 || ^7.0",
44-
"symfony/security-core": "^5.4 || ^6.4 || ^7.0",
45-
"symfony/security-csrf": "^5.4 || ^6.4 || ^7.0",
46-
"symfony/routing": "^5.4 || ^6.4 || ^7.0",
47-
"symfony/translation": "^5.4 || ^6.4 || ^7.0",
48-
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0",
49-
"symfony/validator": "^5.4 || ^6.4 || ^7.0",
50-
"symfony/yaml": "^5.4 || ^6.4 || ^7.0",
51-
"webmozart/assert": "^1.8",
37+
"symfony/config": "^6.4 || ^7.1",
38+
"symfony/deprecation-contracts": "^3.5",
39+
"symfony/expression-language": "^6.4 || ^7.1",
40+
"symfony/form": "^6.4 || ^7.1",
41+
"symfony/framework-bundle": "^6.4 || ^7.1",
42+
"symfony/http-foundation": "^6.4 || ^7.1",
43+
"symfony/intl": "^6.4 || ^7.1",
44+
"symfony/security-core": "^6.4 || ^7.1",
45+
"symfony/security-csrf": "^6.4 || ^7.1",
46+
"symfony/routing": "^6.4 || ^7.1",
47+
"symfony/translation": "^6.4 || ^7.1",
48+
"symfony/twig-bundle": "^6.4 || ^7.1",
49+
"symfony/validator": "^6.4 || ^7.1",
50+
"symfony/yaml": "^6.4 || ^7.1",
51+
"webmozart/assert": "^1.11",
5252
"willdurand/negotiation": "^3.1"
5353
},
5454
"replace": {
5555
"sylius/resource": "self.version"
5656
},
5757
"require-dev": {
58-
"doctrine/doctrine-bundle": "^2.0",
58+
"doctrine/doctrine-bundle": "^2.13",
5959
"doctrine/orm": "^2.18",
60-
"friendsofsymfony/rest-bundle": "^3.0",
60+
"friendsofsymfony/rest-bundle": "^3.7",
6161
"jms/serializer-bundle": "^3.5 || ^4.0 || ^5.0",
6262
"lchrusciel/api-test-case": "^5.0",
6363
"matthiasnoback/symfony-dependency-injection-test": "^4.2.1 || ^5.1",
64-
"pagerfanta/pagerfanta": "^3.7 || ^4.0",
64+
"pagerfanta/pagerfanta": "^4.4",
6565
"pamil/phpspec-skip-example-extension": "^4.2",
66-
"phpspec/phpspec": "^7.3",
67-
"phpspec/prophecy-phpunit": "^2.0",
68-
"phpstan/phpstan": "^1.7",
69-
"phpstan/phpstan-phpunit": "^1.1",
66+
"phpspec/phpspec": "^7.5",
67+
"phpspec/prophecy-phpunit": "^2.2",
68+
"phpstan/phpstan": "^1.12",
69+
"phpstan/phpstan-phpunit": "^1.4",
7070
"phpstan/phpstan-webmozart-assert": "^1.2",
71-
"phpunit/phpunit": "^9.5",
71+
"phpunit/phpunit": "^9.6",
7272
"rector/rector": "^0.18.2",
73-
"sylius-labs/coding-standard": "^4.0",
74-
"sylius/grid-bundle": "^1.11 || ^1.13@beta",
75-
"symfony/console": "^5.4 || ^6.4 || ^7.0",
76-
"symfony/css-selector": "^5.4 || ^6.4 || ^7.0",
77-
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
78-
"symfony/dotenv": "^5.4 || ^6.4 || ^7.0",
79-
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
80-
"symfony/stopwatch": "^5.4 || ^6.4 || ^7.0",
81-
"symfony/uid": "^5.4 || ^6.4 || ^7.0",
82-
"symfony/workflow": "^5.4 || ^6.4 || ^7.0",
83-
"symfony/messenger": "^5.4 || ^6.4 || ^7.0",
84-
"symfony/serializer": "^5.4 || ^6.4 || ^7.0",
85-
"symfony/security-bundle": "^5.4 || ^6.4 || ^7.0",
86-
"twig/twig": "^3.0",
87-
"vimeo/psalm": "^5.20",
88-
"willdurand/hateoas-bundle": "^2.0",
73+
"sylius-labs/coding-standard": "^4.4",
74+
"sylius/grid-bundle": "^1.13",
75+
"symfony/console": "^6.4 || ^7.1",
76+
"symfony/css-selector": "^6.4 || ^7.1",
77+
"symfony/dependency-injection": "^6.4 || ^7.1",
78+
"symfony/dotenv": "^6.4 || ^7.1",
79+
"symfony/http-kernel": "^6.4 || ^7.1",
80+
"symfony/stopwatch": "^6.4 || ^7.1",
81+
"symfony/uid": "^6.4 || ^7.1",
82+
"symfony/workflow": "^6.4 || ^7.1",
83+
"symfony/messenger": "^6.4 || ^7.1",
84+
"symfony/serializer": "^6.4 || ^7.1",
85+
"symfony/security-bundle": "^6.4 || ^7.1",
86+
"twig/twig": "^3.14",
87+
"vimeo/psalm": "^5.26",
88+
"willdurand/hateoas-bundle": "^2.5",
8989
"winzou/state-machine-bundle": "^0.6.2"
9090
},
9191
"conflict": {
9292
"doctrine/orm": "<2.18 || ^3.0",
9393
"doctrine/doctrine-bundle": "<2.0 || ^3.0",
9494
"friendsofsymfony/rest-bundle": "<3.0",
9595
"jms/serializer-bundle": "<3.5",
96-
"willdurand/hateoas-bundle": "<2.0 || ^2.6",
96+
"pagerfanta/pagerfanta" : "<4.4",
97+
"willdurand/hateoas-bundle": "<2.0 || ^3.0",
9798
"winzou/state-machine-bundle": "<0.6.2",
9899
"twig/twig": "<3.0"
99100
},
@@ -110,7 +111,7 @@
110111
},
111112
"extra": {
112113
"symfony": {
113-
"require": "^6.4"
114+
"require": "^7.1"
114115
}
115116
},
116117
"autoload": {

‎src/Component/composer.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
"doctrine/inflector": "^1.4 || ^2.0",
3333
"gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
3434
"pagerfanta/core": "^3.7 || ^4.0",
35-
"symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
36-
"symfony/form": "^5.4 || ^6.4 || ^7.0",
37-
"symfony/http-foundation": "^5.4 || ^6.4 || ^7.0",
38-
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
39-
"symfony/property-access": "^5.4 || ^6.4 || ^7.0",
40-
"symfony/routing": "^5.4 || ^6.4 || ^7.0",
41-
"symfony/security-core": "^5.4 || ^6.4 || ^7.0",
42-
"symfony/security-csrf": "^5.4 || ^6.4 || ^7.0",
43-
"symfony/string": "^5.4 || ^6.4 || ^7.0",
44-
"symfony/translation": "^5.4 || ^6.4 || ^7.0",
45-
"symfony/validator": "^5.4 || ^6.4 || ^7.0",
35+
"symfony/event-dispatcher": "^6.4 || ^7.1",
36+
"symfony/form": "^6.4 || ^7.1",
37+
"symfony/http-foundation": "^6.4 || ^7.1",
38+
"symfony/http-kernel": "^6.4 || ^7.1",
39+
"symfony/property-access": "^6.4 || ^7.1",
40+
"symfony/routing": "^6.4 || ^7.1",
41+
"symfony/security-core": "^6.4 || ^7.1",
42+
"symfony/security-csrf": "^6.4 || ^7.1",
43+
"symfony/string": "^6.4 || ^7.1",
44+
"symfony/translation": "^6.4 || ^7.1",
45+
"symfony/validator": "^6.4 || ^7.1",
4646
"willdurand/negotiation": "^3.1",
4747
"winzou/state-machine": "^0.4"
4848
},
@@ -54,8 +54,8 @@
5454
"phpspec/prophecy-phpunit": "^2.0",
5555
"phpunit/phpunit": "^9.5",
5656
"sylius/grid": "^1.7 || ^1.13@alpha",
57-
"symfony/serializer": "^5.4 || ^6.4 || ^7.0",
58-
"symfony/workflow": "^5.4 || ^6.4 || ^7.0",
57+
"symfony/serializer": "^6.4 || ^7.1",
58+
"symfony/workflow": "^6.4 || ^7.1",
5959
"twig/twig": "^3.0"
6060
},
6161
"conflict": {

‎tests/Application/src/Entity/Author.php‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,17 @@
1616
use Doctrine\ORM\Mapping as ORM;
1717
use JMS\Serializer\Annotation as Serializer;
1818

19-
/**
20-
* @Serializer\ExclusionPolicy("all")
21-
*/
19+
#[Serializer\ExclusionPolicy(policy: 'ALL')]
2220
#[ORM\Embeddable]
2321
final class Author
2422
{
25-
/**
26-
* @Serializer\Expose
27-
*
28-
* @Serializer\Type("string")
29-
*/
23+
#[Serializer\Expose]
24+
#[Serializer\Type(name: 'string')]
3025
#[ORM\Column(name: 'first_name', length: 255)]
3126
private ?string $firstName = null;
3227

33-
/**
34-
* @Serializer\Expose
35-
*
36-
* @Serializer\Type("string")
37-
*/
28+
#[Serializer\Expose]
29+
#[Serializer\Type(name: 'string')]
3830
#[ORM\Column(name: 'last_name', length: 255)]
3931
private ?string $lastName = null;
4032

‎tests/Application/src/Entity/Book.php‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
use Sylius\Resource\Model\TranslatableInterface;
2020
use Sylius\Resource\Model\TranslatableTrait;
2121

22-
/**
23-
* @Serializer\ExclusionPolicy("all")
24-
*/
22+
#[Serializer\ExclusionPolicy(policy: 'ALL')]
2523
#[ORM\Entity]
2624
#[ORM\MappedSuperclass]
2725
#[ORM\Table(name: 'app_book')]
@@ -31,23 +29,16 @@ class Book implements ResourceInterface, TranslatableInterface
3129
__construct as private initializeTranslationsCollection;
3230
}
3331

34-
/**
35-
* @Serializer\Expose
36-
*
37-
* @Serializer\Type("integer")
38-
*
39-
* @Serializer\XmlAttribute
40-
*/
32+
#[Serializer\Expose]
33+
#[Serializer\Type(name: 'integer')]
34+
#[Serializer\XmlAttribute]
4135
#[ORM\Id]
4236
#[ORM\GeneratedValue]
4337
#[ORM\Column]
4438
private ?int $id = null;
4539

46-
/**
47-
* @Serializer\Expose
48-
*
49-
* @Serializer\Type("string")
50-
*/
40+
#[Serializer\Expose]
41+
#[Serializer\Type(name: 'string')]
5142
#[ORM\Column(length: 255)]
5243
private ?string $author = null;
5344

@@ -56,11 +47,8 @@ public function getId(): ?int
5647
return $this->id;
5748
}
5849

59-
/**
60-
* @Serializer\VirtualProperty()
61-
*
62-
* @Serializer\SerializedName("title")
63-
*/
50+
#[Serializer\VirtualProperty]
51+
#[Serializer\SerializedName(name: 'title')]
6452
public function getTitle(): ?string
6553
{
6654
return $this->getTranslation()->getTitle();

0 commit comments

Comments
 (0)