diff --git a/.github_changelog_generator b/.github_changelog_generator index 05cea14..c6da8f5 100644 --- a/.github_changelog_generator +++ b/.github_changelog_generator @@ -1,2 +1,2 @@ unreleased=true -future-release=0.1.0 +future-release=0.2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 207eaeb..bd95d97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,19 @@ # Change Log +## [0.2.0](https://github.com/ItinerisLtd/itineris-wp-coding-standards/tree/0.2.0) (2019-01-28) +[Full Changelog](https://github.com/ItinerisLtd/itineris-wp-coding-standards/compare/0.1.0...0.2.0) + +**Merged pull requests:** + +- Fix: composer require automattic/vipwpcs [\#6](https://github.com/ItinerisLtd/itineris-wp-coding-standards/pull/6) ([TangRufus](https://github.com/TangRufus)) +- Add PSR12 [\#5](https://github.com/ItinerisLtd/itineris-wp-coding-standards/pull/5) ([TangRufus](https://github.com/TangRufus)) +- composer update [\#4](https://github.com/ItinerisLtd/itineris-wp-coding-standards/pull/4) ([TangRufus](https://github.com/TangRufus)) +- Update README.md [\#3](https://github.com/ItinerisLtd/itineris-wp-coding-standards/pull/3) ([TangRufus](https://github.com/TangRufus)) + ## [0.1.0](https://github.com/ItinerisLtd/itineris-wp-coding-standards/tree/0.1.0) (2018-10-18) **Merged pull requests:** +- Version bump 0.1.0 [\#2](https://github.com/ItinerisLtd/itineris-wp-coding-standards/pull/2) ([TangRufus](https://github.com/TangRufus)) - Update readme [\#1](https://github.com/ItinerisLtd/itineris-wp-coding-standards/pull/1) ([TangRufus](https://github.com/TangRufus)) diff --git a/README.md b/README.md index 9bf9a8c..7229bd9 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ [Itineris WP Coding Standards](https://github.com/ItinerisLtd/itineris-wp-coding-standards) is a project with rulesets for code style and quality tools to be used in Itineris WordPress projects. -It is a mix with [PSR-1](https://www.php-fig.org/psr/psr-1/), [PSR-2](https://www.php-fig.org/psr/psr-2), [PSR-4](https://www.php-fig.org/psr/psr-4/), [WordPress Coding Standards](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards) and [Automattic/VIP-Coding-Standards](https://github.com/Automattic/VIP-Coding-Standards). +It is a mix with [PSR-1](https://www.php-fig.org/psr/psr-1/), [PSR-2](https://www.php-fig.org/psr/psr-2), [PSR-4](https://www.php-fig.org/psr/psr-4/), [PSR-12](https://github.com/php-fig/fig-standards/blob/master/proposed/extended-coding-style-guide.md), [WordPress Coding Standards](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards) and [Automattic/VIP-Coding-Standards](https://github.com/Automattic/VIP-Coding-Standards). Whenever there's a conflict between PSR and WPCS, always prefer PSR. diff --git a/composer.json b/composer.json index b57f692..a15e231 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "pretag": [ "composer update", "composer normalize", - "doctoc README.md", + "npx doctoc README.md", "github_changelog_generator --no-verbose" ] },