Skip to content

Commit

Permalink
update CHANGELOG (and minor docblock changes)
Browse files Browse the repository at this point in the history
  • Loading branch information
alcohol committed May 11, 2017
1 parent 10233c5 commit 81c6a2c
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [2.0.0] - 2017/05/11

* Changed: renamed `getBy<Identifier>` methods to `<identifier>` ([#29]).
* Changed: renamed `getAll` to `all` ([#29]).
* Changed: renamed `listBy` to `iterator` ([#29]).
Expand All @@ -25,8 +27,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).

* New: initial release of `league/iso3166`.


[Unreleased]: https://github.com/thephpleague/iso3166/compare/1.0.1...HEAD
[Unreleased]: https://github.com/thephpleague/iso3166/compare/2.0.0...HEAD
[2.0.0]: https://github.com/thephpleague/iso3166/compare/1.0.1...2.0.0
[1.0.1]: https://github.com/thephpleague/iso3166/compare/1.0.0...1.0.1
[1.0.0]: https://github.com/thephpleague/iso3166/compare/64bae4f00dbd5679b9a36c54c37af73d5deb5be1...1.0.0

Expand Down
25 changes: 15 additions & 10 deletions src/ISO3166.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,25 @@

final class ISO3166 implements \Countable, \IteratorAggregate, ISO3166DataProvider
{
/** @var string */
/**
* @var string
*/
const KEY_ALPHA2 = 'alpha2';

/** @var string */
/**
* @var string
*/
const KEY_ALPHA3 = 'alpha3';

/** @var string */
/**
* @var string
*/
const KEY_NUMERIC = 'numeric';

/** @var array */
/**
* @var string[]
*/
private $keys = [self::KEY_ALPHA2, self::KEY_ALPHA3, self::KEY_NUMERIC];

/**
* @param array $countries replace default dataset with given array
* @param array[] $countries replace default dataset with given array
*/
public function __construct(array $countries = [])
{
Expand Down Expand Up @@ -67,7 +72,7 @@ public function numeric($numeric)
}

/**
* @return array
* @return array[]
*/
public function all()
{
Expand Down Expand Up @@ -150,7 +155,7 @@ private function lookup($key, $value)
/**
* Default dataset.
*
* @var array
* @var array[]
*/
protected $countries = [
[
Expand Down

0 comments on commit 81c6a2c

Please sign in to comment.