Merge pull request #166 from maxmind/greg/release

Prepare for 1.11.1
maxmind · Dec 4, 2023 · 7826b00 · 7826b00
2 parents 1aab757 + 1e66f73
commit 7826b00
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git 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)
 -------------------
 

diff --git 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
@@ -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
@@ -14,20 +14,19 @@
         <email>[email protected]</email>
         <active>yes</active>
     </lead>
-    <date>2021-10-18</date>
+    <date>2023-12-01</date>
     <version>
-        <release>1.11.0</release>
-        <api>1.11.0</api>
+        <release>1.11.1</release>
+        <api>1.11.1</api>
     </version>
     <stability>
         <release>stable</release>
         <api>stable</api>
     </stability>
     <license uri="https://github.com/maxmind/MaxMind-DB-Reader-php/blob/main/LICENSE">Apache License 2.0</license>
-    <notes>* 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.</notes>
+    <notes>* Resolve warnings when compiling the C extension.
+* Fix various type issues detected by PHPStan level. Pull request by
+  LauraTaylorUK. GitHub #160.</notes>
     <contents>
         <dir name="/">
             <file role="doc" name="LICENSE"/>

diff --git 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;