Merge branch 'release/v8.0.0'

rinvex · Aug 22, 2021 · 4614e02 · 4614e02
2 parents 4696d23 + 20dccc1
commit 4614e02
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: composer
+ directory: "/"
+ schedule:
+ interval: daily
+ time: "03:00"
+ open-pull-requests-limit: 10
+ target-branch: develop
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,4 +1,5 @@
 preset: recommended
+risky: true
 
 enabled:
  - dir_constant
@@ -28,7 +29,6 @@ enabled:
  - ternary_to_null_coalescing
  - escape_implicit_backslashes
  - fully_qualified_strict_types
- - phpdoc_return_self_reference
  - no_null_property_initialization
  - multiline_comment_opening_closing
  - not_operator_with_successor_space

diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ dist: bionic
 language: php
 
 php:
-- 7.4
 - 8.0
+- 8.1
 
 env:
  global:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 
 
+## [v8.0.0] - 2021-08-22
+- Drop PHP v7 support
+- Update composer dependencies
+- Upgrade to GitHub-native Dependabot (#183)
+- Fixed bug that prevents default value to be returned from get method when attribute exists but is null (#177)
+
 ## [v7.3.2] - 2020-12-25
 - Add support for PHP v8
 
@@ -139,6 +145,7 @@ This project adheres to [Semantic Versioning](CONTRIBUTING.md).
 ## v1.0.0 - 2016-08-20
 - Tag first release.
 
+[v8.0.0]: https://github.com/rinvex/countries/compare/v7.3.2...v8.0.0
 [v7.3.2]: https://github.com/rinvex/countries/compare/v7.3.1...v7.3.2
 [v7.3.1]: https://github.com/rinvex/countries/compare/v7.3.0...v7.3.1
 [v7.3.0]: https://github.com/rinvex/countries/compare/v7.2.0...v7.3.0

diff --git a/composer.json b/composer.json
@@ -43,10 +43,10 @@
  }
  ],
  "require": {
- "php": "^7.4.0 || ^8.0.0"
+ "php": "^8.0.0"
  },
  "require-dev": {
- "codedungeon/phpunit-result-printer": "^0.30.0",
+ "codedungeon/phpunit-result-printer": "^0.31.0",
  "phpunit/phpunit": "^9.5.0"
  },
  "autoload": {

diff --git a/src/Country.php b/src/Country.php
@@ -94,7 +94,7 @@ public function get($key, $default = null)
  }
 
  if (array_key_exists($key, $array)) {
- return $array[$key];
+ return $array[$key] ?? $default;
  }
 
  foreach (explode('.', $key) as $segment) {