Skip to content

Commit 9f7cd7b

Browse files
committed
feature #111 Add Symfony 6 support (Kleinkind)
This PR was squashed before being merged into the 0.1-dev branch. Discussion ---------- Add Symfony 6 support - allowed symfony 6 in version constraints - removed legacy-folder from phpunit config - updated php-cs-fixer - added ci-config for php 8.1 and symfony 6.0.* ⚠️ this also drops support for php 7.1 (php-cs-fixer 3.4 requires php ^7.2.5 || ^8.0) Commits ------- 7044a4f Remove tests for symfony 5.3 and new php versions 8f515d1 Update .gitattributes 07966a4 fix php-versions 0635fc4 fix versions & add missing return-statement 9b8c43d update php-cs-fixer b81f777 fix phpunit config, add ci-config for php 8.1 and symfony 6 8c9a3ee test symfony 6 support
2 parents 5882cfe + 7044a4f commit 9f7cd7b

File tree

7 files changed

+38
-28
lines changed

7 files changed

+38
-28
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/tests export-ignore
22
.gitattributes export-ignore
33
.gitignore export-ignore
4-
.php_cs.dist export-ignore
4+
.php-cs-fixer.dist.php export-ignore
55
.travis.yml export-ignore
66
phpstan-baseline.neon export-ignore
77
phpstan.neon export-ignore

.github/workflows/ci.yaml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
php-version:
16-
- '7.4'
16+
- '8.1'
1717

1818
steps:
1919
- name: 'Check out'
@@ -50,11 +50,11 @@ jobs:
5050
strategy:
5151
matrix:
5252
php-version:
53-
- '7.1'
5453
- '7.2'
5554
- '7.3'
5655
- '7.4'
5756
- '8.0'
57+
- '8.1'
5858

5959
steps:
6060
- name: 'Check out'
@@ -91,17 +91,12 @@ jobs:
9191
strategy:
9292
matrix:
9393
include:
94-
- php-version: '7.1'
95-
composer-options: '--prefer-stable'
96-
- php-version: '7.1'
94+
- php-version: '7.2'
9795
composer-options: '--prefer-lowest --prefer-stable'
9896
symfony-version: '4.4.*'
99-
- php-version: '7.3'
100-
composer-options: '--prefer-stable'
10197
- php-version: '7.2'
102-
- php-version: '7.4'
98+
- php-version: '7.3'
10399
composer-options: '--prefer-stable'
104-
symfony-version: '5.0.*'
105100
- php-version: '7.4'
106101
composer-options: '--prefer-stable'
107102
symfony-version: '5.1.*'
@@ -111,7 +106,21 @@ jobs:
111106
- php-version: '7.4'
112107
composer-options: '--prefer-stable'
113108
symfony-version: '5.3.*'
109+
- php-version: '7.4'
110+
composer-options: '--prefer-stable'
111+
symfony-version: '5.4.*'
112+
- php-version: '8.0'
113+
composer-options: '--prefer-stable'
114+
symfony-version: '5.4.*'
114115
- php-version: '8.0'
116+
composer-options: '--prefer-stable'
117+
symfony-version: '6.0.*'
118+
- php-version: '8.1'
119+
composer-options: '--prefer-stable'
120+
symfony-version: '5.4.*'
121+
- php-version: '8.1'
122+
composer-options: '--prefer-stable'
123+
symfony-version: '6.0.*'
115124

116125
steps:
117126
- name: 'Check out'

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/.php_cs
2-
/.php_cs.cache
1+
/.php-cs-fixer.php
2+
/.php-cs-fixer.cache
33
/.phpunit.result.cache
44
/composer.lock
55
/phpunit.xml

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
$finder->notPath('Dto/Product.php');
2222
}
2323

24-
return PhpCsFixer\Config::create()
24+
$config = (new PhpCsFixer\Config())
2525
->setRules([
2626
'@Symfony' => true,
2727
'@Symfony:risky' => true,
@@ -49,5 +49,6 @@
4949
'void_return' => true,
5050
])
5151
->setRiskyAllowed(true)
52-
->setFinder($finder)
53-
;
52+
->setFinder($finder);
53+
54+
return $config;

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^7.1.3||^8.0",
18+
"php": "^7.2||^8.0",
1919
"psr/container": "^1.0",
20-
"symfony/config": "^4.4||^5.0",
21-
"symfony/dependency-injection": "^4.4||^5.0",
22-
"symfony/form": "^4.4||^5.0",
23-
"symfony/framework-bundle": "^4.4||^5.0",
24-
"symfony/http-kernel": "^4.4||^5.0",
20+
"symfony/config": "^4.4||^5.0||^6.0",
21+
"symfony/dependency-injection": "^4.4||^5.0||^6.0",
22+
"symfony/form": "^4.4||^5.0||^6.0",
23+
"symfony/framework-bundle": "^4.4||^5.0||^6.0",
24+
"symfony/http-kernel": "^4.4||^5.0||^6.0",
2525
"symfony/deprecation-contracts": "^2.1",
26-
"symfony/options-resolver": "^4.4||^5.0",
27-
"symfony/property-access": "^4.4||^5.0"
26+
"symfony/options-resolver": "^4.4||^5.0||^6.0",
27+
"symfony/property-access": "^4.4||^5.0||^6.0"
2828
},
2929
"require-dev": {
30-
"friendsofphp/php-cs-fixer": "^2.16",
30+
"friendsofphp/php-cs-fixer": "^3.4",
3131
"phpstan/phpstan": "^0.12.4",
3232
"symfony/phpunit-bridge": "^4.4.12||^5.2",
33-
"symfony/translation": "^4.4||^5.0"
33+
"symfony/translation": "^4.4||^5.0||^6.0"
3434
},
3535
"conflict": {
3636
"sensiolabs-de/rich-model-forms-bundle": "0.8.*"

phpunit.xml.dist

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
bootstrap="vendor/autoload.php"
66
>
77
<testsuites>
8-
<testsuite name="legacy API">
9-
<directory>./tests/Legacy</directory>
10-
</testsuite>
118
<testsuite name="integration tests">
129
<directory>./tests/Integration</directory>
1310
</testsuite>

src/Qossmic/DataTransformer/ValueObjectTransformer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ public function transform($value)
7373
return $this->getPropertyValue($this->form, $value);
7474
}
7575

76+
/**
77+
* @return mixed
78+
*/
7679
public function reverseTransform($value)
7780
{
7881
try {

0 commit comments

Comments
 (0)