| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
# Conflicts:
# adodb.inc.php
# docs/changelog.md
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-mysqli.inc.php
Fixes #751
|
|
The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.
Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:
- "Merge branch 'hotfix/5.21' Standardized file headers",
e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
20b01e83cb61b6b2460f64c7d1277c5f4cc28574.
Fixes #751
|
|
|
|
The LibTest class was initially created for PHPUnit 7, which is no
longer supported and incompatible with PHP 8.
Adapting function signature to match parent class's definition (return
type) means that ADOdb devs are now required to run PHP 7.2 or later to
execute tests.
|
|
This is a basic test case to ensure the code matches expected results
as discussed in #721 [[1]].
[1]: https://github.com/ADOdb/ADOdb/issues/721#issuecomment-817338903
|
