Merge pull request #243 from jeremykendall/develop

prepare 5.5.0 release

Author: nyamsprod

.github/CONTRIBUTING.md

@@ -10,7 +10,7 @@ We accept bug reports via issues created on [Github](https://github.com/jeremyke
 
 - **Always search the issue or pull request list first** - The odds are good that if you've found a problem, someone else has found it, too.
 
-- **Always try the [master branch](https://github.com/jeremykendall/php-domain-parser)** - to see if the reported bug has not already been fixed.
+- **Always try the [developer branch](https://github.com/jeremykendall/php-domain-parser/tree/develop)** - to see if the reported bug has not already been fixed.
 
 ### When submitting your report
 
@@ -24,8 +24,18 @@ We accept bug reports via issues created on [Github](https://github.com/jeremyke
 
 We accept contributions via Pull Requests on [Github](https://github.com/jeremykendall/php-domain-parser/pull).
 
+- **Always make your Pull Request against the [developer branch](https://github.com/jeremykendall/php-domain-parser/tree/develop)** 
+
 - **[PSR-2 Coding Standard](http://www.php-fig.org/psr/psr-2/)** - Your patch won't be accepted if it doesn't pass the package coding style test suite.
 
+You can resolve most of the styling code issues using the following command line:
+
+```bash
+$ ./vendor/bin/php-cs-fixer fix -vvv --allow-risky=yes
+```
+
+You should run this command **prior** to committing your code.
+
 - **Add tests!** - Your patch won't be accepted if it doesn't have tests.
 
 - **Document any change in behaviour** - Make sure the README and any other relevant documentation are kept up-to-date.

.php_cs

@@ -33,6 +33,8 @@ return PhpCsFixer\Config::create()
         'no_empty_comment' => true,
         'no_leading_import_slash' => true,
         'no_trailing_comma_in_singleline_array' => true,
+        'no_trailing_whitespace' => true,
+        'no_whitespace_in_blank_line' => true,
         'no_unused_imports' => true,
         'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'alpha'],
         'phpdoc_add_missing_param_annotation' => ['only_untyped' => false],

.travis.yml

@@ -2,19 +2,50 @@ language: php
 
 sudo: false
 
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction --prefer-source --no-suggest"
+
 matrix:
   include:
     - php: 7.0
-      env: VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=false
+      env:
+        - VALIDATE_CODING_STYLE=false
+        - RUN_PHPSTAN=false
+        - IGNORE_PLATFORMS=false
     - php: 7.1
-      env: VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=false
+      env:
+        - VALIDATE_CODING_STYLE=false
+        - RUN_PHPSTAN=false
+        - IGNORE_PLATFORMS=false
     - php: 7.2
-      env: VALIDATE_CODING_STYLE=true RUN_PHPSTAN=true IGNORE_PLATFORMS=false
+      env:
+        - VALIDATE_CODING_STYLE=true
+        - RUN_PHPSTAN=true
+        - IGNORE_PLATFORMS=false
     - php: 7.3
-      env: VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=true
+      env:
+        - VALIDATE_CODING_STYLE=false
+        - RUN_PHPSTAN=false
+        - IGNORE_PLATFORMS=true
+    - php: 7.4snapshot
+      env:
+        - COLLECT_COVERAGE=false
+        - VALIDATE_CODING_STYLE=false
+        - RUN_PHPSTAN=false
+        - IGNORE_PLATFORMS=true
     - php: nightly
-      env: VALIDATE_CODING_STYLE=false RUN_PHPSTAN=false IGNORE_PLATFORMS=true
+      env:
+        - COLLECT_COVERAGE=false
+        - IGNORE_PLATFORMS=true
+        - RUN_PHPSTAN=true
+        - VALIDATE_CODING_STYLE=false
   allow_failures:
+    - php: 7.4snapshot
     - php: nightly
   fast_finish: true
 
@@ -26,12 +57,13 @@ before_install:
   - travis_retry composer self-update
 
 install:
-  - if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update --no-interaction --prefer-source --ignore-platform-reqs; fi
-  - if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update --no-interaction --prefer-source; fi
+  - if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update $COMPOSER_ARGS --ignore-platform-reqs; fi
+  - if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update $COMPOSER_ARGS; fi
 
 script:
+  - if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi
+  - if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
   - composer phpunit
 
 after_script:
- - if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
- - if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi
+  - if [ "$COLLECT_COVERAGE" == "true" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/clover.xml; fi

CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All Notable changes to `PHP Domain Parser` **5.x** series will be documented in this file
 
+# 5.5.0 - 2019-04-14
+
+### Added
+
+- Support for IDNA options see [#236](https://github.com/jeremykendall/php-domain-parser/pull/236) thanks to [Insolita](https://github.com/Insolita). 
+
+- `PublicSuffix::labels` and `Domain::labels` to return the VO labels see [#241](https://github.com/jeremykendall/php-domain-parser/pull/241)
+
+- `IDNAConverterTrait::parse` (internal)
+
+### Fixed
+
+- Don't swallow cache errors [#232](https://github.com/jeremykendall/php-domain-parser/issues/232)
+- Update travis settings to allow testing against future version of PHP.
+
+### Deprecated
+
+- `IDNAConverterTrait::setLabels` replaced by `IDNAConverterTrait::parse` (internal)
+
+### Removed
+
+- None
+
 # 5.4.0 - 2018-11-22
 
 ### Added