Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for 1.11.1 #166

Merged
merged 3 commits into from
Dec 4, 2023
Merged

Prepare for 1.11.1 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f449f21
Fix incorrect test namespace
oschwald Dec 1, 2023
cc68560
Add missing changelog entries
oschwald Dec 1, 2023
1e66f73
Bumped version to 1.11.1
oschwald Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
-------------------

Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*",
Expand Down
2 changes: 1 addition & 1 deletion ext/php_maxminddb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 6 additions & 7 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@
<email>goschwald@maxmind.com</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"/>
Expand Down
2 changes: 1 addition & 1 deletion tests/MaxMind/Db/Test/ReaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down