Skip to content

Commit 08ea86a

Browse files
ndm2ndm2
authored
Merge pull request #27 from icings/2.x-stable-cakephp5-version
2.x - Require stable CakePHP 5 version.
2 parents e095ff8 + eaf0fe2 commit 08ea86a

File tree

5 files changed

+44
-32
lines changed

5 files changed

+44
-32
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
db-type: [sqlite, mysql, mariadb, pgsql, sqlsrv]
20-
php-version: ['8.1', '8.2']
20+
php-version: ['8.1', '8.2', '8.3']
2121
cakephp-version: ['latest']
2222

2323
name: |
@@ -38,8 +38,7 @@ jobs:
3838
if: matrix.db-type == 'mysql'
3939
run: |
4040
docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=test -p 3306:3306 -d mysql \
41-
--default-authentication-plugin=mysql_native_password --disable-log-bin --wait_timeout=240 --connect_timeout=240 \
42-
--max_allowed_packet=128M
41+
--mysql-native-password=ON --disable-log-bin --wait_timeout=240 --connect_timeout=240 --max_allowed_packet=128M
4342
sleep 10
4443
4544
- name: Setup MariaDB latest

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
"homepage": "https://ndm.li"
1414
}
1515
],
16-
"minimum-stability": "dev",
16+
"minimum-stability": "stable",
1717
"prefer-stable": true,
1818
"require": {
1919
"php": ">=8.1",
20-
"cakephp/orm": "5.x-dev"
20+
"cakephp/orm": "^5.0"
2121
},
2222
"require-dev": {
23-
"cakephp/cakephp": "5.x-dev",
23+
"cakephp/cakephp": "^5.0",
2424
"cakephp/cakephp-codesniffer": "^5.0",
2525
"phpunit/phpunit": "^10.1"
2626
},

‎phpstan.src.neon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
parameters:
2-
checkMissingIterableValueType: false
3-
checkGenericClassInNonGenericObjectType: false
2+
ignoreErrors:
3+
- identifier: missingType.generics

‎phpstan.tests.neon‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
parameters:
2-
checkMissingIterableValueType: false
3-
checkGenericClassInNonGenericObjectType: false
42
bootstrapFiles:
53
- tests/bootstrap.php
64
ignoreErrors:
5+
-
6+
identifier: missingType.generics
7+
-
8+
identifier: missingType.iterableValue
79
-
810
message: "#^Call to an undefined method object\\:\\:enableAutoQuoting\\(\\)\\.$#"
911
count: 1

‎psalm-baseline.xml‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,61 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
2+
<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
33
<file src="src/ORM/Association/Loader/PartitionableSelectLoader.php">
44
<InternalClass>
5-
<code>SelectLoader</code>
5+
<code><![CDATA[SelectLoader]]></code>
66
</InternalClass>
7+
<RiskyTruthyFalsyComparison>
8+
<code><![CDATA[!$order]]></code>
9+
</RiskyTruthyFalsyComparison>
710
</file>
811
<file src="src/ORM/Association/Loader/PartitionableSelectLoaderTrait.php">
912
<InternalClass>
10-
<code>parent::__construct($options)</code>
11-
<code>parent::__construct($options)</code>
12-
<code>parent::_addFilteringCondition($query, $key, $filter)</code>
13-
<code>parent::_addFilteringCondition($query, $key, $filter)</code>
14-
<code>parent::_buildQuery($options)</code>
15-
<code>parent::_buildQuery($options)</code>
16-
<code>parent::_defaultOptions()</code>
17-
<code>parent::_defaultOptions()</code>
13+
<code><![CDATA[parent::__construct($options)]]></code>
14+
<code><![CDATA[parent::__construct($options)]]></code>
15+
<code><![CDATA[parent::_addFilteringCondition($query, $key, $filter)]]></code>
16+
<code><![CDATA[parent::_addFilteringCondition($query, $key, $filter)]]></code>
17+
<code><![CDATA[parent::_buildQuery($options)]]></code>
18+
<code><![CDATA[parent::_buildQuery($options)]]></code>
19+
<code><![CDATA[parent::_defaultOptions()]]></code>
20+
<code><![CDATA[parent::_defaultOptions()]]></code>
1821
</InternalClass>
1922
<InternalMethod>
20-
<code>parent::__construct($options)</code>
21-
<code>parent::__construct($options)</code>
22-
<code>parent::_addFilteringCondition($query, $key, $filter)</code>
23-
<code>parent::_buildQuery($options)</code>
24-
<code>parent::_buildQuery($options)</code>
25-
<code>parent::_defaultOptions()</code>
23+
<code><![CDATA[parent::__construct($options)]]></code>
24+
<code><![CDATA[parent::__construct($options)]]></code>
25+
<code><![CDATA[parent::_addFilteringCondition($query, $key, $filter)]]></code>
26+
<code><![CDATA[parent::_buildQuery($options)]]></code>
27+
<code><![CDATA[parent::_buildQuery($options)]]></code>
28+
<code><![CDATA[parent::_defaultOptions()]]></code>
2629
</InternalMethod>
2730
<LessSpecificImplementedReturnType>
28-
<code>array</code>
31+
<code><![CDATA[array]]></code>
2932
</LessSpecificImplementedReturnType>
33+
<RiskyTruthyFalsyComparison>
34+
<code><![CDATA[!$limit]]></code>
35+
<code><![CDATA[!$limit]]></code>
36+
<code><![CDATA[$order]]></code>
37+
</RiskyTruthyFalsyComparison>
3038
</file>
3139
<file src="src/ORM/Association/Loader/PartitionableSelectWithPivotLoader.php">
3240
<InternalClass>
33-
<code>SelectWithPivotLoader</code>
34-
<code>parent::_buildResultMap($fetchQuery, $options)</code>
41+
<code><![CDATA[SelectWithPivotLoader]]></code>
42+
<code><![CDATA[parent::_buildResultMap($fetchQuery, $options)]]></code>
3543
</InternalClass>
3644
<InternalMethod>
37-
<code>parent::_buildResultMap($fetchQuery, $options)</code>
45+
<code><![CDATA[parent::_buildResultMap($fetchQuery, $options)]]></code>
3846
</InternalMethod>
47+
<RiskyTruthyFalsyComparison>
48+
<code><![CDATA[!$order]]></code>
49+
</RiskyTruthyFalsyComparison>
3950
</file>
4051
<file src="src/ORM/Association/PartitionableBelongsToMany.php">
4152
<InternalMethod>
42-
<code>buildEagerLoader</code>
53+
<code><![CDATA[buildEagerLoader]]></code>
4354
</InternalMethod>
4455
</file>
4556
<file src="src/ORM/Association/PartitionableHasMany.php">
4657
<InternalMethod>
47-
<code>buildEagerLoader</code>
58+
<code><![CDATA[buildEagerLoader]]></code>
4859
</InternalMethod>
4960
</file>
5061
</files>

0 commit comments

Comments
 (0)