Skip to content

Commit 95d093a

Browse files
committedMay 8, 2023
Merge branch '3.7.x' into 4.0.x
* 3.7.x: (24 commits) PHPStan 1.10.14, PHPUnit 9.6.7 Doctrine Coding Standard 12 Apply `SlevomatCodingStandard.Commenting.AnnotationName` CS rule Remove redundant initialization of column options Use constants for DBAL types in tests Use constants for DBAL types Convert private property `Statement::$paramTypeMap` to class constant `PARAM_TYPE_MAP` Fix anchor text at `types.rst` Add support for SQLite shorthand form in foreign key constraints Fix normalizer regex at `DsnParser::parse()` fix: @links in comment in Column Minor improvement on Psalm typing Update docs for `array` and `object` types Add `DB2111Platform` Replace "magic" values with constants at `DB2Platform` Ignore `static-analysis/` in git archives Use constants for DBAL types at `DB2Platform::initializeDoctrineTypeMappings()` Add line Rework Update psalm structure ...
2 parents d12da23 + fd47abd commit 95d093a

File tree

128 files changed

+1145
-902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+1145
-902
lines changed
 

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
/psalm-strict.xml export-ignore
1313
/run-all.sh export-ignore
1414
/SECURITY.md export-ignore
15+
/static-analysis export-ignore
1516
/tests export-ignore
1617
/UPGRADE.md export-ignore

‎ci/github/phpunit/ibm_db2.xml

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
<var name="db_user" value="db2inst1"/>
1717
<var name="db_password" value="Doctrine2018"/>
1818
<var name="db_dbname" value="doctrine"/>
19+
20+
<var name="tmpdb_driver" value="ibm_db2"/>
21+
<var name="tmpdb_host" value="127.0.0.1"/>
22+
<var name="tmpdb_user" value="db2inst1"/>
23+
<var name="tmpdb_password" value="Doctrine2018"/>
24+
<var name="tmpdb_dbname" value="doctrine"/>
1925
</php>
2026

2127
<testsuites>

0 commit comments

Comments
 (0)
Please sign in to comment.