Merge branch 'release/1.2.3'

GermaniaKG · Feb 5, 2019 · 950153b · 950153b
2 parents ae2bc3b + d868f10
commit 950153b
Show file tree

Hide file tree

Showing 6 changed files with 222 additions and 263 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,27 +1,17 @@
 # .scrutinizer.yml
+
 build:
 
     dependencies:
         before:
             - rm composer.lock
 
-    # ---------------------------------------------------------
-    # This makes no sense here as it will break tests with hhvm
-    # ---------------------------------------------------------
-
-    # tests:
-    #     override:
-    #         -
-    #             command: 'vendor/bin/phpunit --coverage-clover=coverage'
-    #             coverage:
-    #                 file: 'coverage'
-    #                 format: 'php-clover'
-
     nodes:
-        # Common versions: 5.4, 5.5, 5.6, 7.1 or hhvm
         php70:
             environment:
-                php: 7.0.20
+                php:
+                    version: 7.0.20 # Common versions: 5.4, 5.5, 5.6, 7.1 or hhvm
+
             tests:
                 override:
                     -
@@ -32,7 +22,8 @@ build:
 
         php71:
             environment:
-                php: 7.1
+                php:
+                    version: 7.1 # Common versions: 5.4, 5.5, 5.6, 7.1 or hhvm
 
             tests:
                 override:
@@ -44,7 +35,8 @@ build:
 
         php72:
             environment:
-                php: 7.2
+                php:
+                    version: 7.2 # Common versions: 5.4, 5.5, 5.6, 7.1 or hhvm
 
             tests:
                 override:
@@ -54,9 +46,10 @@ build:
                             file: 'coverage'
                             format: 'php-clover'
 
-        php56:
+        php73:
             environment:
-                php: 5.6
+                php:
+                    version: 7.3 # Common versions: 5.4, 5.5, 5.6, 7.1 or hhvm
 
             tests:
                 override:
@@ -66,10 +59,6 @@ build:
                             file: 'coverage'
                             format: 'php-clover'
 
-        hhvm:
-            environment:
-                php: hhvm
-
 
 checks:
     php:
@@ -79,3 +68,6 @@ checks:
 filter:
     excluded_paths:
         - tests/*
+
+
+
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,8 @@ php:
   - "7.0"
   - "7.1"
   - "7.2"
-  - hhvm
+  - "7.3"
+
 
 env:
 

diff --git a/README.md b/README.md
@@ -2,12 +2,14 @@
 
 **Interfaces, traits, and filters for dealing with VAT ID numbers**
 
-[![Build Status](https://travis-ci.org/GermaniaKG/VatIdNo.svg?branch=master)](https://travis-ci.org/GermaniaKG/VatIdNo)
-[![Code Coverage](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/?branch=master)
+[![PHP version](https://img.shields.io/packagist/php-v/germania-kg/vatidno.svg)](https://packagist.org/packages/germania-kg/vatidno)
+[![Build Status](https://img.shields.io/travis/GermaniaKG/VatIdNo.svg?label=Travis%20CI)](https://travis-ci.org/GermaniaKG/VatIdNo)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/?branch=master)
+[![Code Coverage](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/?branch=master)
 [![Build Status](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/badges/build.png?b=master)](https://scrutinizer-ci.com/g/GermaniaKG/VatIdNo/build-status/master)
 
 
+
 ## Installation
 
 ```bash
@@ -152,21 +154,21 @@ endforeach;
 
 To validate the VAT ID numbers, use a dedicated package like **David de Boer's [ddeboer/vatin](https://github.com/ddeboer/vatin)** package.
 
-
 ## Development
 
 ```bash
-$ git clone https://github.com/GermaniaKG/VatIdNo
+$ git clone https://github.com/GermaniaKG/VatIdNo.git
 $ cd VatIdNo
 $ composer install
 ```
 
-
 ## Unit tests
 
-Either copy `phpunit.xml.dist` to `phpunit.xml` and adapt to your needs, or leave as is. 
-Run [PhpUnit](https://phpunit.de/) like this:
+Either copy `phpunit.xml.dist` to `phpunit.xml` and adapt to your needs, or leave as is. Run [PhpUnit](https://phpunit.de/) test or composer scripts like this:
 
 ```bash
+$ composer test
+# or
 $ vendor/bin/phpunit
 ```
+
diff --git a/composer.json b/composer.json
@@ -23,18 +23,20 @@
   },
 
 	"require": {
+		"php": "^5.6|^7.0"
 	},
+
 	"require-dev": {
 		"friendsofphp/php-cs-fixer": "^2.12",
 		"php-coveralls/php-coveralls": "^2.0",
-		"phpunit/phpunit": "^5.7|^6.0"
+		"phpunit/phpunit": "^5.7|^6.0|^7.0"
 	},
 
 	"suggest": {
 		"ddeboer/vatin": "Validate VAT identification numbers"
 	},
 
-  "scripts": {
+  	"scripts": {
 		"phpcs": "php-cs-fixer fix -v --diff --dry-run --allow-risky=yes;",
 		"phpcs-apply": "php-cs-fixer fix -vv --allow-risky=yes;",
  		"phpunit": "phpunit --coverage-text",