From ab59daf5e113c954a808e6155cc40506a3ab03ad Mon Sep 17 00:00:00 2001 From: gggeek Date: Tue, 9 Nov 2021 14:20:28 +0000 Subject: [PATCH] welcome 2021; fix mariadb compat; fix link in ext. info --- bin/php/checkattributes.php | 2 +- bin/php/checkschema.php | 2 +- bin/php/checkstorage.php | 2 +- bin/php/generatedefsfrompersistentobjects.php | 2 +- .../ezdbiezbinaryfilechecker.php | 2 +- .../datatypecheckers/ezdbiezfloatchecker.php | 2 +- .../datatypecheckers/ezdbiezimagechecker.php | 2 +- .../ezdbiezintegerchecker.php | 2 +- .../datatypecheckers/ezdbiezmediachecker.php | 2 +- .../datatypecheckers/ezdbiezstringchecker.php | 2 +- .../datatypecheckers/ezdbiezuserchecker.php | 2 +- .../ezdbinullabletypechecker.php | 2 +- classes/ezdbibasechecker.php | 2 +- classes/ezdbidatatypechecker.php | 2 +- classes/ezdbireportgenerator.php | 2 +- classes/ezdbischemachecker.php | 3 +-- classes/ezdbischemachecks.php | 2 +- classes/ezdbistoragecker.php | 4 ++-- composer.json | 19 +++++++++++++++---- doc/changelogs/changelog-0.23.0-to-0.24.0 | 3 +++ extension.xml | 4 ++-- ezinfo.php | 6 +++--- interfaces/ezdbidatatypecheckerinterface.php | 2 +- interfaces/ezdbischemafileformatinterface.php | 2 +- 24 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 doc/changelogs/changelog-0.23.0-to-0.24.0 diff --git a/bin/php/checkattributes.php b/bin/php/checkattributes.php index 6bddef8..7964cb3 100644 --- a/bin/php/checkattributes.php +++ b/bin/php/checkattributes.php @@ -3,7 +3,7 @@ * A CLI script which checks problems with all object attributes of a given datatype in current database * * @author G. Giunta - * @copyright (C) G. Giunta 2014-2020 + * @copyright (C) G. Giunta 2014-2021 * @license Licensed under GNU General Public License v2.0. See file license.txt */ diff --git a/bin/php/checkschema.php b/bin/php/checkschema.php index be947fa..7bb1b1a 100644 --- a/bin/php/checkschema.php +++ b/bin/php/checkschema.php @@ -3,7 +3,7 @@ * A CLI script which checks problems with data in the current schema * * @author G. Giunta - * @copyright (C) G. Giunta 2014-2020 + * @copyright (C) G. Giunta 2014-2021 * @license Licensed under GNU General Public License v2.0. See file license.txt */ diff --git a/bin/php/checkstorage.php b/bin/php/checkstorage.php index ab6954f..65d1535 100644 --- a/bin/php/checkstorage.php +++ b/bin/php/checkstorage.php @@ -3,7 +3,7 @@ * A CLI script which checks for orphan storage files * * @author G. Giunta - * @copyright (C) G. Giunta 2016-2020 + * @copyright (C) G. Giunta 2016-2021 * @license Licensed under GNU General Public License v2.0. See file license.txt */ diff --git a/bin/php/generatedefsfrompersistentobjects.php b/bin/php/generatedefsfrompersistentobjects.php index c401b4e..08a1b0d 100644 --- a/bin/php/generatedefsfrompersistentobjects.php +++ b/bin/php/generatedefsfrompersistentobjects.php @@ -3,7 +3,7 @@ * A CLI script which checks all persistent object defs for FKs and generates a file with definitions * * @author G. Giunta - * @copyright (C) G. Giunta 2014-2020 + * @copyright (C) G. Giunta 2014-2021 * @license Licensed under GNU General Public License v2.0. See file license.txt */ diff --git a/classes/datatypecheckers/ezdbiezbinaryfilechecker.php b/classes/datatypecheckers/ezdbiezbinaryfilechecker.php index 4abad1a..7e7b778 100644 --- a/classes/datatypecheckers/ezdbiezbinaryfilechecker.php +++ b/classes/datatypecheckers/ezdbiezbinaryfilechecker.php @@ -1,7 +1,7 @@ getWhereQueryFragment( $parentTable, $parentCol ); if( $exceptions != null ) { - $sql .= ' AND ' . $exceptions; } return $this->db->arrayQuery( $sql ); diff --git a/classes/ezdbischemachecks.php b/classes/ezdbischemachecks.php index 565b81b..2ed02ef 100644 --- a/classes/ezdbischemachecks.php +++ b/classes/ezdbischemachecks.php @@ -1,7 +1,7 @@ checks ) as $check ) { - $out[$check] = $this->cehck($check); + $out[$check] = $this->check($check); } return $out; } diff --git a/composer.json b/composer.json index d4fc99b..b2e39a5 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,22 @@ "description": "Allows checking integrity of data in the database", "license": "GPL-2.0-or-later", "homepage": "http://projects.ez.no/ezdbintegrity", - "minimum-stability": "dev", "require": { "ezsystems/ezpublish-legacy-installer": "*" }, "require-dev": { - "gggeek/ezextensionbuilder": "*" - } -} \ No newline at end of file + "codeclimate/php-test-reporter": "~0.4", + "gggeek/ezextensionbuilder": "*", + "phpunit/phpunit": "~4.0 || ~5.0" + }, + "_comment::travis": "the following section is needed to insure that eZPublish 5 can be built using the custom euts directory structure where it is not in the root folder", + "extra": { + "ezpublish-legacy-dir": "vendor/ezsystems/ezpublish-legacy" + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/gggeek/BehatBundle" + } + ] +} diff --git a/doc/changelogs/changelog-0.23.0-to-0.24.0 b/doc/changelogs/changelog-0.23.0-to-0.24.0 new file mode 100644 index 0000000..00fc5b3 --- /dev/null +++ b/doc/changelogs/changelog-0.23.0-to-0.24.0 @@ -0,0 +1,3 @@ +changelog from version 0.23.0 to 0.24.0 + +. fixed: make custom queries work with recent mariadb versions diff --git a/extension.xml b/extension.xml index 2337457..5030817 100644 --- a/extension.xml +++ b/extension.xml @@ -2,8 +2,8 @@ eZ DB Integrity extension - 0.23.0 - Copyright (C) 2014-2020 Gaetano Giunta + 0.24.0 + Copyright (C) 2014-2021 Gaetano Giunta GNU General Public License v2.0 diff --git a/ezinfo.php b/ezinfo.php index 561e5ea..39cbdab 100644 --- a/ezinfo.php +++ b/ezinfo.php @@ -5,9 +5,9 @@ class ezdbintegrityInfo static function info() { return array( - 'Name' => "eZ DB Integrity extension", - 'Version' => "0.23.0", - 'Copyright' => "Copyright (C) 2014-2020 Gaetano Giunta", + 'Name' => "eZ DB Integrity extension", + 'Version' => "0.24.0", + 'Copyright' => "Copyright (C) 2014-2021 Gaetano Giunta", 'License' => "GNU General Public License v2.0" ); } diff --git a/interfaces/ezdbidatatypecheckerinterface.php b/interfaces/ezdbidatatypecheckerinterface.php index 79a7064..ce87a40 100644 --- a/interfaces/ezdbidatatypecheckerinterface.php +++ b/interfaces/ezdbidatatypecheckerinterface.php @@ -1,7 +1,7 @@