Skip to content

Commit f4889ff

Browse files
PhilinTvPhilinTv
authored
Merge pull request #1992 from EpsilonTelecommunications/allow_symfony_7
allow Symfony v7
2 parents 1ca6543 + 880f994 commit f4889ff

File tree

8 files changed

+154
-23
lines changed

8 files changed

+154
-23
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@ jobs:
1616
matrix:
1717
php-version: [ '7.4', '8.2' ]
1818
db-type: [ sqlite, mysql, pgsql, agnostic ]
19-
symfony-version: [ '4-min', '4-max', '5-min', '5-max', '6-min', '6-max' ]
19+
symfony-version: [ '4-min', '4-max', '5-min', '5-max', '6-min', '6-max', '7-min', '7-max']
2020
exclude:
2121
- symfony-version: '4-min'
2222
php-version: '8.2'
2323
- symfony-version: '6-min'
2424
php-version: '7.4'
2525
- symfony-version: '6-max'
2626
php-version: '7.4'
27+
- symfony-version: '7-min'
28+
php-version: '7.4'
29+
- symfony-version: '7-max'
30+
php-version: '7.4'
2731
env:
2832
DB_NAME: 'propel_tests'
2933
DB_USER: 'propel'
@@ -125,6 +129,8 @@ jobs:
125129
else
126130
vendor/bin/phpunit -c tests/${{ matrix.db-type }}.phpunit.xml
127131
fi
132+
env:
133+
SYMFONY_VERSION: ${{ matrix.symfony-version }}
128134

129135
- name: Code Coverage Report
130136
if: success() && matrix.php-version == '7.4' && matrix.symfony-version == '5-max'
@@ -166,6 +172,8 @@ jobs:
166172
run: composer install --prefer-dist --no-interaction
167173

168174
- name: PHPStan
175+
env:
176+
PHPSTAN: 1
169177
run: composer stan
170178

171179
- name: Psalm

‎composer.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"require": {
1919
"php": ">=7.4",
2020
"psr/log": "^1.0 || ^2.0 || ^3.0",
21-
"symfony/yaml": "^4.4.0 || ^5.0.0 || ^6.0.0",
22-
"symfony/config": "^4.4.0 || ^5.0.0 || ^6.0.0",
23-
"symfony/console": "^4.4.0 || ^5.0.0 || ^6.0.0",
24-
"symfony/filesystem": "^4.4.0 || ^5.0.0 || ^6.0.0",
25-
"symfony/finder": "^4.4.0 || ^5.0.0 || ^6.0.0",
26-
"symfony/translation": "^4.4.0 || ^5.0.0 || ^6.0.0",
27-
"symfony/validator": "^4.4.0 || ^5.0.0 || ^6.0.0"
21+
"symfony/yaml": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
22+
"symfony/config": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
23+
"symfony/console": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
24+
"symfony/filesystem": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
25+
"symfony/finder": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
26+
"symfony/translation": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
27+
"symfony/validator": "^4.4.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
2828
},
2929
"require-dev": {
3030
"ext-pdo": "*",

‎src/Propel/Generator/Command/MigrationUpCommand.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected function configure()
4444
*
4545
* @throws \Propel\Runtime\Exception\RuntimeException
4646
*/
47-
protected function execute(InputInterface $input, OutputInterface $output)
47+
protected function execute(InputInterface $input, OutputInterface $output): int
4848
{
4949
$configOptions = [];
5050

‎src/Propel/Runtime/Validator/Constraints/Date.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
class Date extends SymfonyDateConstraint
1414
{
15-
/**
16-
* @var string
17-
*/
18-
public $message = 'This value is not a valid date.';
19-
2015
/**
2116
* @var string
2217
*/

‎tests/Propel/Tests/Common/Config/Loader/FileLoaderTest.php‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,18 +362,14 @@ public function testCallResolveParamTwiceReturnsEmpty()
362362

363363
class TestableFileLoader extends BaseFileLoader
364364
{
365-
/**
366-
* @return void
367-
*/
368-
public function load($resource, $type = null)
365+
public function load($resource, $type = null): ?array
369366
{
367+
return null;
370368
}
371369

372-
/**
373-
* @return void
374-
*/
375-
public function supports($resource, $type = null)
370+
public function supports($resource, $type = null): bool
376371
{
372+
return false;
377373
}
378374

379375
/**

‎tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ class LastMessageHandler extends AbstractHandler
564564
*
565565
* @return bool
566566
*/
567-
public function handle(array $record): bool
567+
public function handle($record): bool
568568
{
569569
$this->latestMessage = (string)$record['message'];
570570

‎tests/composer/composer-symfony7-max.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"name": "propel/propel",
3+
"type": "library",
4+
"description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.5 and up.",
5+
"keywords": [
6+
"ORM",
7+
"persistence",
8+
"Active Record"
9+
],
10+
"homepage": "http://www.propelorm.org/",
11+
"license": "MIT",
12+
"authors": [
13+
{
14+
"name": "William Durand",
15+
"email": "william.durand1@gmail.com"
16+
}
17+
],
18+
"require": {
19+
"php": ">=8.2",
20+
"symfony/yaml": "^7.0.0",
21+
"symfony/config": "^7.0.0",
22+
"symfony/console": "^7.0.0",
23+
"symfony/filesystem": "^7.0.0",
24+
"symfony/finder": "^7.0.0",
25+
"symfony/translation": "^7.0.0",
26+
"symfony/validator": "^7.0.0",
27+
"psr/log": "^1.0 || ^2.0 || ^3.0"
28+
},
29+
"require-dev": {
30+
"ext-pdo": "*",
31+
"ext-json": "*",
32+
"ext-xml": "*",
33+
"monolog/monolog": "^1.3 || ^2.3 || ^3.0",
34+
"phpstan/phpstan": "^1.2",
35+
"phpunit/phpunit": "^9.5.0",
36+
"spryker/code-sniffer": "^0.17.2",
37+
"psalm/phar": "^4.23",
38+
"mikey179/vfsstream": "^1.6"
39+
},
40+
"suggest": {
41+
"monolog/monolog": "The recommended logging library to use with Propel."
42+
},
43+
"autoload": {
44+
"psr-4": {
45+
"Propel\\": "src/Propel/"
46+
}
47+
},
48+
"bin": [
49+
"bin/propel"
50+
],
51+
"scripts": {
52+
"stan": [
53+
"vendor/bin/phpstan analyze -l 1 -c tests/phpstan.neon src/"
54+
]
55+
},
56+
"extra": {
57+
"branch-alias": {
58+
"dev-master": "2.0-dev"
59+
}
60+
},
61+
"config": {
62+
"allow-plugins": {
63+
"dealerdirect/phpcodesniffer-composer-installer": true
64+
}
65+
}
66+
}

‎tests/composer/composer-symfony7-min.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"name": "propel/propel",
3+
"type": "library",
4+
"description": "Propel2 is an open-source Object-Relational Mapping (ORM) for PHP 5.5 and up.",
5+
"keywords": [
6+
"ORM",
7+
"persistence",
8+
"Active Record"
9+
],
10+
"homepage": "http://www.propelorm.org/",
11+
"license": "MIT",
12+
"authors": [
13+
{
14+
"name": "William Durand",
15+
"email": "william.durand1@gmail.com"
16+
}
17+
],
18+
"require": {
19+
"php": ">=8.2",
20+
"symfony/yaml": "~7.0.0",
21+
"symfony/config": "~7.0.0",
22+
"symfony/console": "~7.0.0",
23+
"symfony/filesystem": "~7.0.0",
24+
"symfony/finder": "~7.0.0",
25+
"symfony/translation": "~7.0.0",
26+
"symfony/validator": "~7.0.0",
27+
"psr/log": "^1.0 || ^2.0 || ^3.0"
28+
},
29+
"require-dev": {
30+
"ext-pdo": "*",
31+
"ext-json": "*",
32+
"ext-xml": "*",
33+
"monolog/monolog": "^1.3 || ^2.3 || ^3.0",
34+
"phpstan/phpstan": "^1.2",
35+
"phpunit/phpunit": "^9.5.0",
36+
"spryker/code-sniffer": "^0.17.2",
37+
"psalm/phar": "^4.23",
38+
"mikey179/vfsstream": "^1.6"
39+
},
40+
"suggest": {
41+
"monolog/monolog": "The recommended logging library to use with Propel."
42+
},
43+
"autoload": {
44+
"psr-4": {
45+
"Propel\\": "src/Propel/"
46+
}
47+
},
48+
"bin": [
49+
"bin/propel"
50+
],
51+
"scripts": {
52+
"stan": [
53+
"vendor/bin/phpstan analyze -l 1 -c tests/phpstan.neon src/"
54+
]
55+
},
56+
"extra": {
57+
"branch-alias": {
58+
"dev-master": "2.0-dev"
59+
}
60+
},
61+
"config": {
62+
"allow-plugins": {
63+
"dealerdirect/phpcodesniffer-composer-installer": true
64+
}
65+
}
66+
}

0 commit comments

Comments
 (0)