From f449f21a8bddce423843adcf3284607074b825f3 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 1 Dec 2023 14:43:18 -0800 Subject: [PATCH 1/3] Fix incorrect test namespace --- tests/MaxMind/Db/Test/ReaderTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/MaxMind/Db/Test/ReaderTest.php b/tests/MaxMind/Db/Test/ReaderTest.php index 4be31ff..c0cb7fc 100644 --- a/tests/MaxMind/Db/Test/ReaderTest.php +++ b/tests/MaxMind/Db/Test/ReaderTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MaxMind\Db\Test\Reader; +namespace MaxMind\Db\Test; use MaxMind\Db\Reader; use MaxMind\Db\Reader\InvalidDatabaseException; From cc685607401f0f0fec2f4cc91aeaf8f7ca06f1a3 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 1 Dec 2023 14:43:33 -0800 Subject: [PATCH 2/3] Add missing changelog entries --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17415fc..15e5361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +1.11.1 (2023-12-01) +------------------- + +* Resolve warnings when compiling the C extension. +* Fix various type issues detected by PHPStan level. Pull request by + LauraTaylorUK. GitHub #160. + 1.11.0 (2021-10-18) ------------------- From 1e66f73ffcf25e17c7a910a1317e9720a95497c7 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Fri, 1 Dec 2023 16:09:23 -0800 Subject: [PATCH 3/3] Bumped version to 1.11.1 --- composer.json | 2 +- ext/php_maxminddb.h | 2 +- package.xml | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index b66b2a0..22ea797 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups" }, "conflict": { - "ext-maxminddb": "<1.11.0,>=2.0.0" + "ext-maxminddb": "<1.11.1,>=2.0.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "3.*", diff --git a/ext/php_maxminddb.h b/ext/php_maxminddb.h index 2d76d27..8acb282 100644 --- a/ext/php_maxminddb.h +++ b/ext/php_maxminddb.h @@ -15,7 +15,7 @@ #ifndef PHP_MAXMINDDB_H #define PHP_MAXMINDDB_H 1 -#define PHP_MAXMINDDB_VERSION "1.11.0" +#define PHP_MAXMINDDB_VERSION "1.11.1" #define PHP_MAXMINDDB_EXTNAME "maxminddb" extern zend_module_entry maxminddb_module_entry; diff --git a/package.xml b/package.xml index a971627..e7b3277 100644 --- a/package.xml +++ b/package.xml @@ -14,20 +14,19 @@ goschwald@maxmind.com yes - 2021-10-18 + 2023-12-01 - 1.11.0 - 1.11.0 + 1.11.1 + 1.11.1 stable stable Apache License 2.0 - * Replace runtime define of a constant to facilitate opcache preloading. - Reported by vedadkajtaz. GitHub #134. -* Resolve minor issue found by the Clang static analyzer in the C - extension. + * Resolve warnings when compiling the C extension. +* Fix various type issues detected by PHPStan level. Pull request by + LauraTaylorUK. GitHub #160.