Drop PHP 5 support completely, upgrade to PHPUnit 6.

.travis.yml

@@ -6,7 +6,6 @@ php:
   - 7.2
   - 7.1
   - 7.0
-  - 5.6
 
 install:
   - composer self-update

README.md

@@ -3,7 +3,7 @@ addressing
 
 [![Build Status](https://travis-ci.org/commerceguys/addressing.svg?branch=master)](https://travis-ci.org/commerceguys/addressing)
 
-A PHP 5.5+ addressing library, powered by CLDR and Google's address data.
+A PHP 7.0+ addressing library, powered by CLDR and Google's address data.
 
 Manipulates postal addresses, meant to identify a precise recipient location for shipping or billing purposes.
 

composer.json

@@ -5,12 +5,12 @@
     "keywords": ["postal", "address", "internationalization", "localization"],
     "license": "MIT",
     "require": {
-        "php": ">=5.5.0",
+        "php": ">=7.0.8",
         "doctrine/collections": "~1.0"
     },
     "require-dev": {
-        "symfony/validator": ">=3.2",
-        "phpunit/phpunit": "~4.0",
+        "symfony/validator": "^3.4",
+        "phpunit/phpunit": "^6.0",
         "mikey179/vfsstream": "1.*",
         "squizlabs/php_codesniffer": "2.*"
     },

tests/AbstractEnumTest.php

@@ -3,11 +3,12 @@
 namespace CommerceGuys\Addressing\Tests;
 
 use CommerceGuys\Addressing\Subdivision\PatternType;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\AbstractEnum
  */
-class AbstractEnumTest extends \PHPUnit_Framework_TestCase
+final class AbstractEnumTest extends TestCase
 {
     /**
      * @covers ::getAll

tests/AddressFormat/AddressFormatHelperTest.php

@@ -7,11 +7,12 @@
 use CommerceGuys\Addressing\AddressFormat\AddressFormatHelper;
 use CommerceGuys\Addressing\AddressFormat\FieldOverride;
 use CommerceGuys\Addressing\AddressFormat\FieldOverrides;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\AddressFormat\AddressFormatHelper
  */
-class AddressFormatHelperTest extends \PHPUnit_Framework_TestCase
+final class AddressFormatHelperTest extends TestCase
 {
     /**
      * @covers ::getGroupedFields

tests/AddressFormat/AddressFormatRepositoryTest.php

@@ -7,11 +7,12 @@
 use CommerceGuys\Addressing\AddressFormat\AdministrativeAreaType;
 use CommerceGuys\Addressing\AddressFormat\LocalityType;
 use CommerceGuys\Addressing\AddressFormat\PostalCodeType;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\AddressFormat\AddressFormatRepository
  */
-class AddressFormatRepositoryTest extends \PHPUnit_Framework_TestCase
+final class AddressFormatRepositoryTest extends TestCase
 {
     /**
      * @covers ::get

tests/AddressFormat/AddressFormatTest.php

@@ -8,11 +8,12 @@
 use CommerceGuys\Addressing\AddressFormat\DependentLocalityType;
 use CommerceGuys\Addressing\AddressFormat\LocalityType;
 use CommerceGuys\Addressing\AddressFormat\PostalCodeType;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\AddressFormat\AddressFormat
  */
-class AddressFormatTest extends \PHPUnit_Framework_TestCase
+final class AddressFormatTest extends TestCase
 {
     /**
      * @covers ::__construct

tests/AddressFormat/FieldOverridesTest.php

@@ -5,11 +5,12 @@
 use CommerceGuys\Addressing\AddressFormat\AddressField;
 use CommerceGuys\Addressing\AddressFormat\FieldOverride;
 use CommerceGuys\Addressing\AddressFormat\FieldOverrides;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\AddressFormat\FieldOverrides
  */
-class FieldOverridesTest extends \PHPUnit_Framework_TestCase
+final class FieldOverridesTest extends TestCase
 {
     /**
      * @covers ::__construct

tests/AddressTest.php

@@ -3,11 +3,12 @@
 namespace CommerceGuys\Addressing\Tests;
 
 use CommerceGuys\Addressing\Address;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Address
  */
-class AddressTest extends \PHPUnit_Framework_TestCase
+final class AddressTest extends TestCase
 {
     /**
      * @covers ::__construct

tests/Country/CountryRepositoryTest.php

@@ -5,11 +5,12 @@
 use CommerceGuys\Addressing\Country\Country;
 use CommerceGuys\Addressing\Country\CountryRepository;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Country\CountryRepository
  */
-class CountryRepositoryTest extends \PHPUnit_Framework_TestCase
+final class CountryRepositoryTest extends TestCase
 {
     /**
      * Country definitions.

tests/Country/CountryTest.php

@@ -3,18 +3,20 @@
 namespace CommerceGuys\Addressing\Tests\Country;
 
 use CommerceGuys\Addressing\Country\Country;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Country\Country
  */
-class CountryTest extends \PHPUnit_Framework_TestCase
+final class CountryTest extends TestCase
 {
     /**
      * @covers ::__construct
      */
     public function testMissingProperty()
     {
-        $this->setExpectedException(\InvalidArgumentException::class, 'Missing required property "country_code".');
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Missing required property "country_code".');
         $country = new Country([]);
     }
 

tests/Formatter/DefaultFormatterTest.php

@@ -7,11 +7,12 @@
 use CommerceGuys\Addressing\Country\CountryRepository;
 use CommerceGuys\Addressing\Formatter\DefaultFormatter;
 use CommerceGuys\Addressing\Subdivision\SubdivisionRepository;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Formatter\DefaultFormatter
  */
-class DefaultFormatterTest extends \PHPUnit_Framework_TestCase
+final class DefaultFormatterTest extends TestCase
 {
     /**
      * The address format repository.
@@ -44,7 +45,7 @@ class DefaultFormatterTest extends \PHPUnit_Framework_TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->addressFormatRepository = new AddressFormatRepository();
         $this->countryRepository = new CountryRepository();

tests/Formatter/PostalLabelFormatterTest.php

@@ -7,11 +7,12 @@
 use CommerceGuys\Addressing\Country\CountryRepository;
 use CommerceGuys\Addressing\Formatter\PostalLabelFormatter;
 use CommerceGuys\Addressing\Subdivision\SubdivisionRepository;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Formatter\PostalLabelFormatter
  */
-class PostalLabelFormatterTest extends \PHPUnit_Framework_TestCase
+final class PostalLabelFormatterTest extends TestCase
 {
     /**
      * The address format repository.
@@ -44,7 +45,7 @@ class PostalLabelFormatterTest extends \PHPUnit_Framework_TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->addressFormatRepository = new AddressFormatRepository();
         $this->countryRepository = new CountryRepository();

tests/LocaleTest.php

@@ -4,11 +4,12 @@
 
 use CommerceGuys\Addressing\Exception\UnknownLocaleException;
 use CommerceGuys\Addressing\Locale;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Locale
  */
-class LocaleTest extends \PHPUnit_Framework_TestCase
+final class LocaleTest extends TestCase
 {
     /**
      * @covers ::match
@@ -57,7 +58,7 @@ public function testResolve()
      */
     public function testResolveWithoutResult()
     {
-        $this->setExpectedException(UnknownLocaleException::class);
+        $this->expectException(UnknownLocaleException::class);
         $availableLocales = ['bs', 'en'];
         $locale = Locale::resolve($availableLocales, 'de');
     }

tests/PostalCodeHelperTest.php

@@ -3,11 +3,12 @@
 namespace CommerceGuys\Addressing\Tests;
 
 use CommerceGuys\Addressing\PostalCodeHelper;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\PostalCodeHelper
  */
-class PostalCodeHelperTest extends \PHPUnit_Framework_TestCase
+final class PostalCodeHelperTest extends TestCase
 {
     /**
      * @covers ::match

tests/Subdivision/LazySubdivisionCollectionTest.php

@@ -3,11 +3,12 @@
 namespace CommerceGuys\Addressing\Tests\Subdivision;
 
 use CommerceGuys\Addressing\Subdivision\LazySubdivisionCollection;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Subdivision\LazySubdivisionCollection
  */
-class LazySubdivisionCollectionTest extends \PHPUnit_Framework_TestCase
+final class LazySubdivisionCollectionTest extends TestCase
 {
     /**
      * @var LazySubdivisionCollection
@@ -17,7 +18,7 @@ class LazySubdivisionCollectionTest extends \PHPUnit_Framework_TestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->collection = new LazySubdivisionCollection(['BR', 'Porto Acre']);
     }

tests/Subdivision/SubdivisionRepositoryTest.php

@@ -5,11 +5,12 @@
 use CommerceGuys\Addressing\Subdivision\Subdivision;
 use CommerceGuys\Addressing\Subdivision\SubdivisionRepository;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Subdivision\SubdivisionRepository
  */
-class SubdivisionRepositoryTest extends \PHPUnit_Framework_TestCase
+final class SubdivisionRepositoryTest extends TestCase
 {
     /**
      * Subdivisions.

tests/Subdivision/SubdivisionTest.php

@@ -5,11 +5,12 @@
 use CommerceGuys\Addressing\Subdivision\PatternType;
 use CommerceGuys\Addressing\Subdivision\Subdivision;
 use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Subdivision\Subdivision
  */
-class SubdivisionTest extends \PHPUnit_Framework_TestCase
+final class SubdivisionTest extends TestCase
 {
     /**
      * @covers ::__construct

tests/UpdateHelperTest.php

@@ -3,11 +3,12 @@
 namespace CommerceGuys\Addressing\Tests;
 
 use CommerceGuys\Addressing\UpdateHelper;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\UpdateHelper
  */
-class UpdateHelperTest extends \PHPUnit_Framework_TestCase
+final class UpdateHelperTest extends TestCase
 {
     /**
      * @covers ::splitRecipient

tests/Validator/Constraints/AddressFormatConstraintValidatorTest.php

@@ -13,7 +13,7 @@
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Validator\Constraints\AddressFormatConstraintValidator
  */
-class AddressFormatConstraintValidatorTest extends ConstraintValidatorTestCase
+final class AddressFormatConstraintValidatorTest extends ConstraintValidatorTestCase
 {
     /**
      * @var AddressFormatConstraint
@@ -23,7 +23,7 @@ class AddressFormatConstraintValidatorTest extends ConstraintValidatorTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->constraint = new AddressFormatConstraint();
 

tests/Validator/Constraints/CountryConstraintValidatorTest.php

@@ -9,7 +9,7 @@
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Validator\Constraints\CountryConstraintValidator
  */
-class CountryConstraintValidatorTest extends ConstraintValidatorTestCase
+final class CountryConstraintValidatorTest extends ConstraintValidatorTestCase
 {
     /**
      * @var CountryConstraint
@@ -19,7 +19,7 @@ class CountryConstraintValidatorTest extends ConstraintValidatorTestCase
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->constraint = new CountryConstraint();
 

tests/Zone/ZoneTerritoryTest.php

@@ -4,11 +4,12 @@
 
 use CommerceGuys\Addressing\Address;
 use CommerceGuys\Addressing\Zone\ZoneTerritory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Zone\ZoneTerritory
  */
-class ZoneTerritoryTest extends \PHPUnit_Framework_TestCase
+final class ZoneTerritoryTest extends TestCase
 {
     /**
      * @covers ::__construct

tests/Zone/ZoneTest.php

@@ -4,11 +4,12 @@
 
 use CommerceGuys\Addressing\Address;
 use CommerceGuys\Addressing\Zone\Zone;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @coversDefaultClass \CommerceGuys\Addressing\Zone\Zone
  */
-class ZoneTest extends \PHPUnit_Framework_TestCase
+final class ZoneTest extends TestCase
 {
     /**
      * @covers ::__construct