Merge pull request #27 from icings/2.x-stable-cakephp5-version

2.x - Require stable CakePHP 5 version.

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
  fail-fast: false
  matrix:
  db-type: [sqlite, mysql, mariadb, pgsql, sqlsrv]
- php-version: ['8.1', '8.2']
+ php-version: ['8.1', '8.2', '8.3']
  cakephp-version: ['latest']
 
  name: |
@@ -38,8 +38,7 @@ jobs:
  if: matrix.db-type == 'mysql'
  run: |
  docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=test -p 3306:3306 -d mysql \
- --default-authentication-plugin=mysql_native_password --disable-log-bin --wait_timeout=240 --connect_timeout=240 \
- --max_allowed_packet=128M
+ --mysql-native-password=ON --disable-log-bin --wait_timeout=240 --connect_timeout=240 --max_allowed_packet=128M
  sleep 10
 
  - name: Setup MariaDB latest

composer.json

@@ -13,14 +13,14 @@
  "homepage": "https://ndm.li"
  }
  ],
- "minimum-stability": "dev",
+ "minimum-stability": "stable",
  "prefer-stable": true,
  "require": {
  "php": ">=8.1",
- "cakephp/orm": "5.x-dev"
+ "cakephp/orm": "^5.0"
  },
  "require-dev": {
- "cakephp/cakephp": "5.x-dev",
+ "cakephp/cakephp": "^5.0",
  "cakephp/cakephp-codesniffer": "^5.0",
  "phpunit/phpunit": "^10.1"
  },

phpstan.src.neon

@@ -1,3 +1,3 @@
 parameters:
- checkMissingIterableValueType: false
- checkGenericClassInNonGenericObjectType: false
+ ignoreErrors:
+  - identifier: missingType.generics

phpstan.tests.neon

@@ -1,9 +1,11 @@
 parameters:
- checkMissingIterableValueType: false
- checkGenericClassInNonGenericObjectType: false
  bootstrapFiles:
  - tests/bootstrap.php
  ignoreErrors:
+ -
+ identifier: missingType.generics
+ -
+ identifier: missingType.iterableValue
  -
  message: "#^Call to an undefined method object\\:\\:enableAutoQuoting\\(\\)\\.$#"
  count: 1

psalm-baseline.xml

@@ -1,50 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.13.1@086b94371304750d1c673315321a55d15fc59015">
+<files psalm-version="5.24.0@462c80e31c34e58cc4f750c656be3927e80e550e">
  <file src="src/ORM/Association/Loader/PartitionableSelectLoader.php">
  <InternalClass>
- <code>SelectLoader</code>
+ <code><![CDATA[SelectLoader]]></code>
  </InternalClass>
+ <RiskyTruthyFalsyComparison>
+ <code><![CDATA[!$order]]></code>
+ </RiskyTruthyFalsyComparison>
  </file>
  <file src="src/ORM/Association/Loader/PartitionableSelectLoaderTrait.php">
  <InternalClass>
- <code>parent::__construct($options)</code>
- <code>parent::__construct($options)</code>
- <code>parent::_addFilteringCondition($query, $key, $filter)</code>
- <code>parent::_addFilteringCondition($query, $key, $filter)</code>
- <code>parent::_buildQuery($options)</code>
- <code>parent::_buildQuery($options)</code>
- <code>parent::_defaultOptions()</code>
- <code>parent::_defaultOptions()</code>
+ <code><![CDATA[parent::__construct($options)]]></code>
+ <code><![CDATA[parent::__construct($options)]]></code>
+ <code><![CDATA[parent::_addFilteringCondition($query, $key, $filter)]]></code>
+ <code><![CDATA[parent::_addFilteringCondition($query, $key, $filter)]]></code>
+ <code><![CDATA[parent::_buildQuery($options)]]></code>
+ <code><![CDATA[parent::_buildQuery($options)]]></code>
+ <code><![CDATA[parent::_defaultOptions()]]></code>
+ <code><![CDATA[parent::_defaultOptions()]]></code>
  </InternalClass>
  <InternalMethod>
- <code>parent::__construct($options)</code>
- <code>parent::__construct($options)</code>
- <code>parent::_addFilteringCondition($query, $key, $filter)</code>
- <code>parent::_buildQuery($options)</code>
- <code>parent::_buildQuery($options)</code>
- <code>parent::_defaultOptions()</code>
+ <code><![CDATA[parent::__construct($options)]]></code>
+ <code><![CDATA[parent::__construct($options)]]></code>
+ <code><![CDATA[parent::_addFilteringCondition($query, $key, $filter)]]></code>
+ <code><![CDATA[parent::_buildQuery($options)]]></code>
+ <code><![CDATA[parent::_buildQuery($options)]]></code>
+ <code><![CDATA[parent::_defaultOptions()]]></code>
  </InternalMethod>
  <LessSpecificImplementedReturnType>
- <code>array</code>
+ <code><![CDATA[array]]></code>
  </LessSpecificImplementedReturnType>
+ <RiskyTruthyFalsyComparison>
+ <code><![CDATA[!$limit]]></code>
+ <code><![CDATA[!$limit]]></code>
+ <code><![CDATA[$order]]></code>
+ </RiskyTruthyFalsyComparison>
  </file>
  <file src="src/ORM/Association/Loader/PartitionableSelectWithPivotLoader.php">
  <InternalClass>
- <code>SelectWithPivotLoader</code>
- <code>parent::_buildResultMap($fetchQuery, $options)</code>
+ <code><![CDATA[SelectWithPivotLoader]]></code>
+ <code><![CDATA[parent::_buildResultMap($fetchQuery, $options)]]></code>
  </InternalClass>
  <InternalMethod>
- <code>parent::_buildResultMap($fetchQuery, $options)</code>
+ <code><![CDATA[parent::_buildResultMap($fetchQuery, $options)]]></code>
  </InternalMethod>
+ <RiskyTruthyFalsyComparison>
+ <code><![CDATA[!$order]]></code>
+ </RiskyTruthyFalsyComparison>
  </file>
  <file src="src/ORM/Association/PartitionableBelongsToMany.php">
  <InternalMethod>
- <code>buildEagerLoader</code>
+ <code><![CDATA[buildEagerLoader]]></code>
  </InternalMethod>
  </file>
  <file src="src/ORM/Association/PartitionableHasMany.php">
  <InternalMethod>
- <code>buildEagerLoader</code>
+ <code><![CDATA[buildEagerLoader]]></code>
  </InternalMethod>
  </file>
 </files>