update2

pfosten/vendor/fzaninotto/faker/test/Faker/Calculator/IbanTest.php

@@ -3,8 +3,9 @@
 namespace Faker\Test\Calculator;
 
 use Faker\Calculator\Iban;
+use PHPUnit\Framework\TestCase;
 
-class IbanTest extends \PHPUnit_Framework_TestCase
+class IbanTest extends TestCase
 {
 
     public function checksumProvider()

pfosten/vendor/fzaninotto/faker/test/Faker/Calculator/LuhnTest.php

@@ -3,8 +3,9 @@
 namespace Faker\Test\Calculator;
 
 use Faker\Calculator\Luhn;
+use PHPUnit\Framework\TestCase;
 
-class LuhnTest extends \PHPUnit_Framework_TestCase
+class LuhnTest extends TestCase
 {
 
     public function checkDigitProvider()
@@ -18,10 +19,10 @@ class LuhnTest extends \PHPUnit_Framework_TestCase
             array('510510510510510', '0'),
             array(7992739871, '3'),
             array(3852000002323, '7'),
-            array(37144963539843, '1'),
-            array(561059108101825, '0'),
-            array(601100099013942, '4'),
-            array(510510510510510, '0')
+            array('37144963539843', '1'),
+            array('561059108101825', '0'),
+            array('601100099013942', '4'),
+            array('510510510510510', '0')
         );
     }
 
@@ -59,4 +60,13 @@ class LuhnTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals($isValid, Luhn::isValid($number));
     }
+
+    /**
+     * @expectedException        InvalidArgumentException
+     * @expectedExceptionMessage Argument should be an integer.
+     */
+    public function testGenerateLuhnNumberWithInvalidPrefix()
+    {
+        Luhn::generateLuhnNumber('abc');
+    }
 }

pfosten/vendor/fzaninotto/faker/test/Faker/DefaultGeneratorTest.php

@@ -3,20 +3,21 @@
 namespace Faker\Test;
 
 use Faker\DefaultGenerator;
+use PHPUnit\Framework\TestCase;
 
-class DefaultGeneratorTest extends \PHPUnit_Framework_TestCase
+class DefaultGeneratorTest extends TestCase
 {
     public function testGeneratorReturnsNullByDefault()
     {
         $generator = new DefaultGenerator;
-        $this->assertSame(null, $generator->value);
+        $this->assertNull($generator->value);
     }
 
     public function testGeneratorReturnsDefaultValueForAnyPropertyGet()
     {
         $generator = new DefaultGenerator(123);
         $this->assertSame(123, $generator->foo);
-        $this->assertNotSame(null, $generator->bar);
+        $this->assertNotNull($generator->bar);
     }
 
     public function testGeneratorReturnsDefaultValueForAnyMethodCall()

pfosten/vendor/fzaninotto/faker/test/Faker/GeneratorTest.php

@@ -3,8 +3,9 @@
 namespace Faker\Test;
 
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class GeneratorTest extends \PHPUnit_Framework_TestCase
+class GeneratorTest extends TestCase
 {
     public function testAddProviderGivesPriorityToNewlyAddedProvider()
     {
@@ -19,7 +20,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
         $generator = new Generator;
         $provider = new FooProvider();
         $generator->addProvider($provider);
-        $this->assertTrue(is_callable($generator->getFormatter('fooFormatter')));
+        $this->assertInternalType('callable', $generator->getFormatter('fooFormatter'));
     }
 
     public function testGetFormatterReturnsCorrectFormatter()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Generator;
 use Faker\Provider\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
     private $faker;
 

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/BarcodeTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Generator;
 use Faker\Provider\Barcode;
+use PHPUnit\Framework\TestCase;
 
-class BarcodeTest extends \PHPUnit_Framework_TestCase
+class BarcodeTest extends TestCase
 {
     private $faker;
 

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/BaseTest.php

@@ -3,33 +3,35 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Base as BaseProvider;
+use PHPUnit\Framework\TestCase;
+use Traversable;
 
-class BaseTest extends \PHPUnit_Framework_TestCase
+class BaseTest extends TestCase
 {
     public function testRandomDigitReturnsInteger()
     {
-        $this->assertTrue(is_integer(BaseProvider::randomDigit()));
+        $this->assertInternalType('integer', BaseProvider::randomDigit());
     }
 
     public function testRandomDigitReturnsDigit()
     {
-        $this->assertTrue(BaseProvider::randomDigit() >= 0);
-        $this->assertTrue(BaseProvider::randomDigit() < 10);
+        $this->assertGreaterThanOrEqual(0, BaseProvider::randomDigit());
+        $this->assertLessThan(10, BaseProvider::randomDigit());
     }
 
     public function testRandomDigitNotNullReturnsNotNullDigit()
     {
-        $this->assertTrue(BaseProvider::randomDigitNotNull() > 0);
-        $this->assertTrue(BaseProvider::randomDigitNotNull() < 10);
+        $this->assertGreaterThan(0, BaseProvider::randomDigitNotNull());
+        $this->assertLessThan(10, BaseProvider::randomDigitNotNull());
     }
 
 
     public function testRandomDigitNotReturnsValidDigit()
     {
         for ($i = 0; $i <= 9; $i++) {
-            $this->assertTrue(BaseProvider::randomDigitNot($i) >= 0);
-            $this->assertTrue(BaseProvider::randomDigitNot($i) < 10);
-            $this->assertTrue(BaseProvider::randomDigitNot($i) !== $i);
+            $this->assertGreaterThanOrEqual(0, BaseProvider::randomDigitNot($i));
+            $this->assertLessThan(10, BaseProvider::randomDigitNot($i));
+            $this->assertNotSame(BaseProvider::randomDigitNot($i), $i);
         }
     }
 
@@ -51,14 +53,14 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 
     public function testRandomNumberReturnsInteger()
     {
-        $this->assertTrue(is_integer(BaseProvider::randomNumber()));
-        $this->assertTrue(is_integer(BaseProvider::randomNumber(5, false)));
+        $this->assertInternalType('integer', BaseProvider::randomNumber());
+        $this->assertInternalType('integer', BaseProvider::randomNumber(5, false));
     }
 
     public function testRandomNumberReturnsDigit()
     {
-        $this->assertTrue(BaseProvider::randomNumber(3) >= 0);
-        $this->assertTrue(BaseProvider::randomNumber(3) < 1000);
+        $this->assertGreaterThanOrEqual(0, BaseProvider::randomNumber(3));
+        $this->assertLessThan(1000, BaseProvider::randomNumber(3));
     }
 
     public function testRandomNumberAcceptsStrictParamToEnforceNumberSize()
@@ -98,7 +100,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
 
     public function testRandomLetterReturnsString()
     {
-        $this->assertTrue(is_string(BaseProvider::randomLetter()));
+        $this->assertInternalType('string', BaseProvider::randomLetter());
     }
 
     public function testRandomLetterReturnsSingleLetter()
@@ -109,12 +111,12 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     public function testRandomLetterReturnsLowercaseLetter()
     {
         $lowercaseLetters = 'abcdefghijklmnopqrstuvwxyz';
-        $this->assertTrue(strpos($lowercaseLetters, BaseProvider::randomLetter()) !== false);
+        $this->assertNotFalse(strpos($lowercaseLetters, BaseProvider::randomLetter()));
     }
 
     public function testRandomAsciiReturnsString()
     {
-        $this->assertTrue(is_string(BaseProvider::randomAscii()));
+        $this->assertInternalType('string', BaseProvider::randomAscii());
     }
 
     public function testRandomAsciiReturnsSingleCharacter()
@@ -125,7 +127,7 @@ class BaseTest extends \PHPUnit_Framework_TestCase
     public function testRandomAsciiReturnsAsciiCharacter()
     {
         $lowercaseLetters = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
-        $this->assertTrue(strpos($lowercaseLetters, BaseProvider::randomAscii()) !== false);
+        $this->assertNotFalse(strpos($lowercaseLetters, BaseProvider::randomAscii()));
     }
 
     public function testRandomElementReturnsNullWhenArrayEmpty()
@@ -133,6 +135,11 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertNull(BaseProvider::randomElement(array()));
     }
 
+    public function testRandomElementReturnsNullWhenCollectionEmpty()
+    {
+        $this->assertNull(BaseProvider::randomElement(new Collection(array())));
+    }
+
     public function testRandomElementReturnsElementFromArray()
     {
         $elements = array('23', 'e', 32, '#');
@@ -145,6 +152,12 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertContains(BaseProvider::randomElement($elements), $elements);
     }
 
+    public function testRandomElementReturnsElementFromCollection()
+    {
+        $collection = new Collection(array('one', 'two', 'three'));
+        $this->assertContains(BaseProvider::randomElement($collection), $collection);
+    }
+
     public function testShuffleReturnsStringWhenPassedAStringArgument()
     {
         $this->assertInternalType('string', BaseProvider::shuffle('foo'));
@@ -547,5 +560,13 @@ class BaseTest extends \PHPUnit_Framework_TestCase
         $this->assertContains('foo', $shuffled);
         $this->assertContains('bar', $shuffled);
         $this->assertContains('baz', $shuffled);
+
+        $allowDuplicates = BaseProvider::randomElements(array('foo', 'bar'), 3, true);
+        $this->assertCount(3, $allowDuplicates);
+        $this->assertContainsOnly('string', $allowDuplicates);
     }
 }
+
+class Collection extends \ArrayObject
+{
+}

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/BiasedTest.php

@@ -3,14 +3,15 @@ namespace Faker\Test\Provider;
 
 use Faker\Provider\Biased;
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class BiasedTest extends \PHPUnit_Framework_TestCase
+class BiasedTest extends TestCase
 {
     const MAX = 10;
     const NUMBERS = 25000;
     protected $generator;
     protected $results = array();
-    
+
     protected function setUp()
     {
         $this->generator = new Generator();
@@ -18,14 +19,14 @@ class BiasedTest extends \PHPUnit_Framework_TestCase
 
         $this->results = array_fill(1, self::MAX, 0);
     }
-    
+
     public function performFake($function)
     {
         for($i = 0; $i < self::NUMBERS; $i++) {
             $this->results[$this->generator->biasedNumberBetween(1, self::MAX, $function)]++;
         }
     }
-    
+
     public function testUnbiased()
     {
         $this->performFake(array('\Faker\Provider\Biased', 'unbiased'));
@@ -40,7 +41,7 @@ class BiasedTest extends \PHPUnit_Framework_TestCase
             $this->assertLessThan(self::NUMBERS * $assumed * 1.05, $amount, "Value was more than 5 percent over the expected value");
         }
     }
-    
+
     public function testLinearHigh()
     {
         $this->performFake(array('\Faker\Provider\Biased', 'linearHigh'));
@@ -54,7 +55,7 @@ class BiasedTest extends \PHPUnit_Framework_TestCase
             $this->assertLessThan(self::NUMBERS * $assumed * 1.1, $amount, "Value was more than 10 percent over the expected value");
         }
     }
-    
+
     public function testLinearLow()
     {
         $this->performFake(array('\Faker\Provider\Biased', 'linearLow'));

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ColorTest.php

@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Color;
+use PHPUnit\Framework\TestCase;
 
-class ColorTest extends \PHPUnit_Framework_TestCase
+class ColorTest extends TestCase
 {
 
     public function testHexColor()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/CompanyTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider;
 use Faker\Generator;
 use Faker\Provider\Company;
 use Faker\Provider\Lorem;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     /**
      * @var Generator

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/DateTimeTest.php

@@ -3,27 +3,77 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\DateTime as DateTimeProvider;
+use PHPUnit\Framework\TestCase;
 
-class DateTimeTest extends \PHPUnit_Framework_TestCase
+class DateTimeTest extends TestCase
 {
     public function setUp()
     {
-        $this->originalTz = date_default_timezone_get();
         $this->defaultTz = 'UTC';
-        date_default_timezone_set($this->defaultTz);
+        DateTimeProvider::setDefaultTimezone($this->defaultTz);
     }
 
     public function tearDown()
     {
-        date_default_timezone_set($this->originalTz);
+        DateTimeProvider::setDefaultTimezone();
+    }
+
+    public function testPreferDefaultTimezoneOverSystemTimezone()
+    {
+        /**
+         * Set the system timezone to something *other* than the timezone used
+         * in setUp().
+         */
+        $originalSystemTimezone = date_default_timezone_get();
+        $systemTimezone = 'Antarctica/Vostok';
+        date_default_timezone_set($systemTimezone);
+
+        /**
+         * Get a new date/time value and assert that it prefers the default
+         * timezone over the system timezone.
+         */
+        $date = DateTimeProvider::dateTime();
+        $this->assertNotSame($systemTimezone, $date->getTimezone()->getName());
+        $this->assertSame($this->defaultTz, $date->getTimezone()->getName());
+
+        /**
+         * Restore the system timezone.
+         */
+        date_default_timezone_set($originalSystemTimezone);
+    }
+
+    public function testUseSystemTimezoneWhenDefaultTimezoneIsNotSet()
+    {
+        /**
+         * Set the system timezone to something *other* than the timezone used
+         * in setUp() *and* reset the default timezone.
+         */
+        $originalSystemTimezone = date_default_timezone_get();
+        $originalDefaultTimezone = DateTimeProvider::getDefaultTimezone();
+        $systemTimezone = 'Antarctica/Vostok';
+        date_default_timezone_set($systemTimezone);
+        DateTimeProvider::setDefaultTimezone();
+
+        /**
+         * Get a new date/time value and assert that it uses the system timezone
+         * and not the system timezone.
+         */
+        $date = DateTimeProvider::dateTime();
+        $this->assertSame($systemTimezone, $date->getTimezone()->getName());
+        $this->assertNotSame($this->defaultTz, $date->getTimezone()->getName());
+
+        /**
+         * Restore the system timezone.
+         */
+        date_default_timezone_set($originalSystemTimezone);
     }
 
     public function testUnixTime()
     {
         $timestamp = DateTimeProvider::unixTime();
         $this->assertInternalType('int', $timestamp);
-        $this->assertTrue($timestamp >= 0);
-        $this->assertTrue($timestamp <= time());
+        $this->assertGreaterThanOrEqual(0, $timestamp);
+        $this->assertLessThanOrEqual(time(), $timestamp);
     }
 
     public function testDateTime()
@@ -50,6 +100,66 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(new \DateTimeZone($this->defaultTz), $date->getTimezone());
     }
 
+    public function testDateTimeThisCentury()
+    {
+        $date = DateTimeProvider::dateTimeThisCentury();
+        $this->assertInstanceOf('\DateTime', $date);
+        $this->assertGreaterThanOrEqual(new \DateTime('-100 year'), $date);
+        $this->assertLessThanOrEqual(new \DateTime(), $date);
+        $this->assertEquals(new \DateTimeZone($this->defaultTz), $date->getTimezone());
+    }
+
+    public function testDateTimeThisDecade()
+    {
+        $date = DateTimeProvider::dateTimeThisDecade();
+        $this->assertInstanceOf('\DateTime', $date);
+        $this->assertGreaterThanOrEqual(new \DateTime('-10 year'), $date);
+        $this->assertLessThanOrEqual(new \DateTime(), $date);
+        $this->assertEquals(new \DateTimeZone($this->defaultTz), $date->getTimezone());
+    }
+
+    public function testDateTimeThisYear()
+    {
+        $date = DateTimeProvider::dateTimeThisYear();
+        $this->assertInstanceOf('\DateTime', $date);
+        $this->assertGreaterThanOrEqual(new \DateTime('-1 year'), $date);
+        $this->assertLessThanOrEqual(new \DateTime(), $date);
+        $this->assertEquals(new \DateTimeZone($this->defaultTz), $date->getTimezone());
+    }
+
+    public function testDateTimeThisMonth()
+    {
+        $date = DateTimeProvider::dateTimeThisMonth();
+        $this->assertInstanceOf('\DateTime', $date);
+        $this->assertGreaterThanOrEqual(new \DateTime('-1 month'), $date);
+        $this->assertLessThanOrEqual(new \DateTime(), $date);
+        $this->assertEquals(new \DateTimeZone($this->defaultTz), $date->getTimezone());
+    }
+
+    public function testDateTimeThisCenturyWithTimezone()
+    {
+        $date = DateTimeProvider::dateTimeThisCentury('now', 'America/New_York');
+        $this->assertEquals($date->getTimezone(), new \DateTimeZone('America/New_York'));
+    }
+
+    public function testDateTimeThisDecadeWithTimezone()
+    {
+        $date = DateTimeProvider::dateTimeThisDecade('now', 'America/New_York');
+        $this->assertEquals($date->getTimezone(), new \DateTimeZone('America/New_York'));
+    }
+
+    public function testDateTimeThisYearWithTimezone()
+    {
+        $date = DateTimeProvider::dateTimeThisYear('now', 'America/New_York');
+        $this->assertEquals($date->getTimezone(), new \DateTimeZone('America/New_York'));
+    }
+
+    public function testDateTimeThisMonthWithTimezone()
+    {
+        $date = DateTimeProvider::dateTimeThisMonth('now', 'America/New_York');
+        $this->assertEquals($date->getTimezone(), new \DateTimeZone('America/New_York'));
+    }
+
     public function testIso8601()
     {
         $date = DateTimeProvider::iso8601();
@@ -103,7 +213,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
     {
         $date = DateTimeProvider::dateTimeInInterval($start, $interval);
         $this->assertInstanceOf('\DateTime', $date);
-        
+
         $_interval = \DateInterval::createFromDateString($interval);
         $_start = new \DateTime($start);
         if ($isInFuture) {
@@ -126,7 +236,7 @@ class DateTimeTest extends \PHPUnit_Framework_TestCase
 
     public function testFixedSeedWithMaximumTimestamp()
     {
-        $max = '2018-03-01 12:00:00';
+        $max = '2118-03-01 12:00:00';
 
         mt_srand(1);
         $unixTime = DateTimeProvider::unixTime($max);

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ImageTest.php

@@ -3,27 +3,28 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Image;
+use PHPUnit\Framework\TestCase;
 
-class ImageTest extends \PHPUnit_Framework_TestCase
+class ImageTest extends TestCase
 {
     public function testImageUrlUses640x680AsTheDefaultSize()
     {
-        $this->assertRegExp('#^http://lorempixel.com/640/480/#', Image::imageUrl());
+        $this->assertRegExp('#^https://lorempixel.com/640/480/#', Image::imageUrl());
     }
 
     public function testImageUrlAcceptsCustomWidthAndHeight()
     {
-        $this->assertRegExp('#^http://lorempixel.com/800/400/#', Image::imageUrl(800, 400));
+        $this->assertRegExp('#^https://lorempixel.com/800/400/#', Image::imageUrl(800, 400));
     }
 
     public function testImageUrlAcceptsCustomCategory()
     {
-        $this->assertRegExp('#^http://lorempixel.com/800/400/nature/#', Image::imageUrl(800, 400, 'nature'));
+        $this->assertRegExp('#^https://lorempixel.com/800/400/nature/#', Image::imageUrl(800, 400, 'nature'));
     }
 
     public function testImageUrlAcceptsCustomText()
     {
-        $this->assertRegExp('#^http://lorempixel.com/800/400/nature/Faker#', Image::imageUrl(800, 400, 'nature', false, 'Faker'));
+        $this->assertRegExp('#^https://lorempixel.com/800/400/nature/Faker#', Image::imageUrl(800, 400, 'nature', false, 'Faker'));
     }
 
     public function testImageUrlAddsARandomGetParameterByDefault()
@@ -45,7 +46,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
 
     public function testDownloadWithDefaults()
     {
-        $url = "http://www.lorempixel.com/";
+        $url = "http://lorempixel.com/";
         $curlPing = curl_init($url);
         curl_setopt($curlPing, CURLOPT_TIMEOUT, 5);
         curl_setopt($curlPing, CURLOPT_CONNECTTIMEOUT, 5);

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/InternetTest.php

@@ -7,14 +7,15 @@ use Faker\Provider\Company;
 use Faker\Provider\Internet;
 use Faker\Provider\Lorem;
 use Faker\Provider\Person;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
     /**
      * @var Generator
      */
     private $faker;
-    
+
     public function setUp()
     {
         $faker = new Generator();
@@ -40,29 +41,65 @@ class InternetTest extends \PHPUnit_Framework_TestCase
     /**
      * @link http://stackoverflow.com/questions/12026842/how-to-validate-an-email-address-in-php
      *
-     * @requires PHP 5.4
      * @dataProvider localeDataProvider
      */
     public function testEmailIsValid($locale)
     {
+        if ($locale !== 'en_US' && !class_exists('Transliterator')) {
+            $this->markTestSkipped('Transliterator class not available (intl extension)');
+        }
+
         $this->loadLocalProviders($locale);
         $pattern = '/^(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){255,})(?!(?:(?:\\x22?\\x5C[\\x00-\\x7E]\\x22?)|(?:\\x22?[^\\x5C\\x22]\\x22?)){65,}@)(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22))(?:\\.(?:(?:[\\x21\\x23-\\x27\\x2A\\x2B\\x2D\\x2F-\\x39\\x3D\\x3F\\x5E-\\x7E]+)|(?:\\x22(?:[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x21\\x23-\\x5B\\x5D-\\x7F]|(?:\\x5C[\\x00-\\x7F]))*\\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-+[a-z0-9]+)*\\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-+[a-z0-9]+)*)|(?:\\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\\]))$/iD';
         $emailAddress = $this->faker->email();
         $this->assertRegExp($pattern, $emailAddress);
     }
-    
+
     /**
-     * @requires PHP 5.4
      * @dataProvider localeDataProvider
      */
     public function testUsernameIsValid($locale)
     {
+        if ($locale !== 'en_US' && !class_exists('Transliterator')) {
+            $this->markTestSkipped('Transliterator class not available (intl extension)');
+        }
+
         $this->loadLocalProviders($locale);
-        $pattern = '/^[A-Za-z0-9._]+$/';
+        $pattern = '/^[A-Za-z0-9]+([._][A-Za-z0-9]+)*$/';
         $username = $this->faker->username();
         $this->assertRegExp($pattern, $username);
     }
 
+    /**
+     * @dataProvider localeDataProvider
+     */
+    public function testDomainnameIsValid($locale)
+    {
+        if ($locale !== 'en_US' && !class_exists('Transliterator')) {
+            $this->markTestSkipped('Transliterator class not available (intl extension)');
+        }
+
+        $this->loadLocalProviders($locale);
+        $pattern = '/^[a-z]+(\.[a-z]+)+$/';
+        $domainName = $this->faker->domainName();
+        $this->assertRegExp($pattern, $domainName);
+    }
+
+    /**
+     * @dataProvider localeDataProvider
+     */
+    public function testDomainwordIsValid($locale)
+    {
+        if ($locale !== 'en_US' && !class_exists('Transliterator')) {
+            $this->markTestSkipped('Transliterator class not available (intl extension)');
+        }
+
+        $this->loadLocalProviders($locale);
+        $pattern = '/^[a-z]+$/';
+        $domainWord = $this->faker->domainWord();
+        $this->assertRegExp($pattern, $domainWord);
+    }
+
     public function loadLocalProviders($locale)
     {
         $providerPath = realpath(__DIR__ . '/../../../src/Faker/Provider');
@@ -110,7 +147,7 @@ class InternetTest extends \PHPUnit_Framework_TestCase
 
     public function testIpv4NotLocalNetwork()
     {
-        $this->assertNotRegExp('/\A1\./', $this->faker->ipv4());
+        $this->assertNotRegExp('/\A0\./', $this->faker->ipv4());
     }
 
     public function testIpv4NotBroadcast()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/LocalizationTest.php

@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Factory;
+use PHPUnit\Framework\TestCase;
 
-class LocalizationTest extends \PHPUnit_Framework_TestCase
+class LocalizationTest extends TestCase
 {
     public function testLocalizedNameProvidersDoNotThrowErrors()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/LoremTest.php

@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Lorem;
+use PHPUnit\Framework\TestCase;
 
-class LoremTest extends \PHPUnit_Framework_TestCase
+class LoremTest extends TestCase
 {
     /**
      * @expectedException \InvalidArgumentException

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/MiscellaneousTest.php

@@ -3,10 +3,10 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\Miscellaneous;
+use PHPUnit\Framework\TestCase;
 
-class MiscellaneousTest extends \PHPUnit_Framework_TestCase
+class MiscellaneousTest extends TestCase
 {
-
     public function testBoolean()
     {
         $this->assertContains(Miscellaneous::boolean(), array(true, false));
@@ -51,4 +51,9 @@ class MiscellaneousTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertRegExp('/^[A-Z]{3}$/', Miscellaneous::currencyCode());
     }
+
+    public function testEmoji()
+    {
+        $this->assertRegExp('/^[\x{1F600}-\x{1F637}]$/u', Miscellaneous::emoji());
+    }
 }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/PaymentTest.php

@@ -9,8 +9,9 @@ use Faker\Provider\Base as BaseProvider;
 use Faker\Provider\DateTime as DateTimeProvider;
 use Faker\Provider\Payment as PaymentProvider;
 use Faker\Provider\Person as PersonProvider;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     private $faker;
 
@@ -47,15 +48,16 @@ class PaymentTest extends \PHPUnit_Framework_TestCase
 
     public function testCreditCardTypeReturnsValidVendorName()
     {
-        $this->assertTrue(in_array($this->faker->creditCardType, array('Visa', 'MasterCard', 'American Express', 'Discover Card')));
+        $this->assertContains($this->faker->creditCardType, array('Visa', 'Visa Retired', 'MasterCard', 'American Express', 'Discover Card'));
     }
 
     public function creditCardNumberProvider()
     {
         return array(
             array('Discover Card', '/^6011\d{12}$/'),
-            array('Visa', '/^4\d{12,15}$/'),
-            array('MasterCard', '/^5[1-5]\d{14}$/')
+            array('Visa', '/^4\d{15}$/'),
+            array('Visa Retired', '/^4\d{12}$/'),
+            array('MasterCard', '/^(5[1-5]|2[2-7])\d{14}$/')
         );
     }
 
@@ -108,6 +110,7 @@ class PaymentTest extends \PHPUnit_Framework_TestCase
         'DO' => '/^DO\d{2}[A-Z0-9]{4}\d{20}$/',
         'EE' => '/^EE\d{2}\d{2}\d{2}\d{11}\d{1}$/',
         'ES' => '/^ES\d{2}\d{4}\d{4}\d{1}\d{1}\d{10}$/',
+        'FI' => '/^FI\d{2}\d{6}\d{7}\d{1}$/',
         'FR' => '/^FR\d{2}\d{5}\d{5}[A-Z0-9]{11}\d{2}$/',
         'GB' => '/^GB\d{2}[A-Z]{4}\d{6}\d{8}$/',
         'GE' => '/^GE\d{2}[A-Z]{2}\d{16}$/',

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Provider\Person;
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     /**
      * @dataProvider firstNameProvider

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/PhoneNumberTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider;
 use Faker\Generator;
 use Faker\Calculator\Luhn;
 use Faker\Provider\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ProviderOverrideTest.php

@@ -6,6 +6,7 @@
 namespace Faker\Test\Provider;
 
 use Faker;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ProviderOverrideTest
@@ -16,7 +17,7 @@ use Faker;
  * locale specific provider (can) has specific implementations. The goal of this test is to test the common denominator
  * and to try to catch possible invalid multi-byte sequences.
  */
-class ProviderOverrideTest extends \PHPUnit_Framework_TestCase
+class ProviderOverrideTest extends TestCase
 {
     /**
      * Constants with regular expression patterns for testing the output.
@@ -77,6 +78,10 @@ class ProviderOverrideTest extends \PHPUnit_Framework_TestCase
      */
     public function testInternet($locale = null)
     {
+        if ($locale && $locale !== 'en_US' && !class_exists('Transliterator')) {
+            $this->markTestSkipped('Transliterator class not available (intl extension)');
+        }
+
         $faker = Faker\Factory::create($locale);
 
         $this->assertRegExp(static::TEST_STRING_REGEX, $faker->userName);

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/TextTest.php

@@ -3,8 +3,9 @@ namespace Faker\Test\Provider;
 
 use Faker\Provider\en_US\Text;
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class TextTest extends \PHPUnit_Framework_TestCase
+class TextTest extends TestCase
 {
     public function testTextMaxLength()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/UserAgentTest.php

@@ -3,8 +3,9 @@
 namespace Faker\Test\Provider;
 
 use Faker\Provider\UserAgent;
+use PHPUnit\Framework\TestCase;
 
-class UserAgentTest extends \PHPUnit_Framework_TestCase
+class UserAgentTest extends TestCase
 {
     public function testRandomUserAgent()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/UuidTest.php

@@ -2,9 +2,11 @@
 
 namespace Faker\Test\Provider;
 
+use Faker\Generator;
 use Faker\Provider\Uuid as BaseProvider;
+use PHPUnit\Framework\TestCase;
 
-class UuidTest extends \PHPUnit_Framework_TestCase
+class UuidTest extends TestCase
 {
     public function testUuidReturnsUuid()
     {
@@ -14,7 +16,11 @@ class UuidTest extends \PHPUnit_Framework_TestCase
 
     public function testUuidExpectedSeed()
     {
-        mt_srand(123);
+        if (pack('L', 0x6162797A) == pack('N', 0x6162797A)) {
+            $this->markTestSkipped('Big Endian');
+        }
+        $faker = new Generator();
+        $faker->seed(123);
         $this->assertEquals("8e2e0c84-50dd-367c-9e66-f3ab455c78d6", BaseProvider::uuid());
         $this->assertEquals("073eb60a-902c-30ab-93d0-a94db371f6c8", BaseProvider::uuid());
     }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ar_JO/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\fi_FI\Person;
 use Faker\Provider\fi_FI\Internet;
 use Faker\Provider\fi_FI\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ar_SA/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\ar_SA\Person;
 use Faker\Provider\ar_SA\Internet;
 use Faker\Provider\ar_SA\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/at_AT/PaymentTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\at_AT;
 
 use Faker\Generator;
 use Faker\Provider\at_AT\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/bg_BG/PaymentTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\bg_BG;
 
 use Faker\Generator;
 use Faker\Provider\bg_BG\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/bn_BD/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\bn_BD;
 
 use Faker\Generator;
 use Faker\Provider\bn_BD\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/cs_CZ/PersonTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\cs_CZ;
 use Faker\Generator;
 use Faker\Provider\cs_CZ\Person;
 use Faker\Provider\Miscellaneous;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function testBirthNumber()
     {
@@ -14,7 +15,7 @@ class PersonTest extends \PHPUnit_Framework_TestCase
         $faker->addProvider(new Person($faker));
         $faker->addProvider(new Miscellaneous($faker));
 
-        for ($i = 0; $i < 1000; $i++) { 
+        for ($i = 0; $i < 1000; $i++) {
             $birthNumber = $faker->birthNumber();
             $birthNumber = str_replace('/', '', $birthNumber);
 
@@ -39,7 +40,7 @@ class PersonTest extends \PHPUnit_Framework_TestCase
                 if ($refCrc == 10) {
                     $refCrc = 0;
                 }
-                $this->assertEquals($crc, $refCrc, "Birth number $birthNumber: checksum $crc doesn't match expected $refCrc.");;
+                $this->assertEquals($crc, $refCrc, "Birth number $birthNumber: checksum $crc doesn't match expected $refCrc.");
             }
         }
     }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/da_DK/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\da_DK\Person;
 use Faker\Provider\da_DK\Internet;
 use Faker\Provider\da_DK\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\de_AT\Person;
 use Faker\Provider\de_AT\Internet;
 use Faker\Provider\de_AT\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/de_AT/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\de_AT;
 
 use Faker\Generator;
 use Faker\Provider\de_AT\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/AddressTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\de_CH;
 use Faker\Generator;
 use Faker\Provider\de_CH\Address;
 use Faker\Provider\de_CH\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\de_CH\Person;
 use Faker\Provider\de_CH\Internet;
 use Faker\Provider\de_CH\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/de_CH/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\de_CH;
 
 use Faker\Generator;
 use Faker\Provider\de_CH\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/de_DE/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\de_DE\Person;
 use Faker\Provider\de_DE\Internet;
 use Faker\Provider\de_DE\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_AU/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Provider\en_AU;
 
 use Faker\Generator;
 use Faker\Provider\en_AU\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
   /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_CA/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Provider\en_CA;
 
 use Faker\Generator;
 use Faker\Provider\en_CA\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
   /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_IN/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Provider\en_IN;
 
 use Faker\Generator;
 use Faker\Provider\en_IN\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
   /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_NZ/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_NZ;
 
 use Faker\Generator;
 use Faker\Provider\en_NZ\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_PH/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_PH;
 
 use Faker\Generator;
 use Faker\Provider\en_PH\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_SG;
 
 use Faker\Factory;
 use Faker\Provider\en_SG\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
     public function setUp()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_SG/PhoneNumberTest.php

@@ -4,14 +4,17 @@ namespace Faker\Test\Provider\en_SG;
 
 use Faker\Factory;
 use Faker\Provider\en_SG\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
+    private $faker;
+
     public function setUp()
     {
-        $faker = Factory::create('en_SG');
-        $faker->addProvider(new PhoneNumber($faker));
-        $this->faker = $faker;
+        $this->faker = Factory::create('en_SG');
+        $this->faker->seed(1);
+        $this->faker->addProvider(new PhoneNumber($this->faker));
     }
 
     // http://en.wikipedia.org/wiki/Telephone_numbers_in_Singapore#Numbering_plan

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_UG/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_UG;
 
 use Faker\Generator;
 use Faker\Provider\en_UG\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
 /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PaymentTest.php

@@ -4,8 +4,9 @@
 namespace Faker\Provider\en_US;
 
 use Faker\Generator;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     /**
      * @var Generator

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_US/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_US;
 
 use Faker\Generator;
 use Faker\Provider\en_US\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/CompanyTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_ZA;
 
 use Faker\Generator;
 use Faker\Provider\en_ZA\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     private $faker;
 
@@ -23,4 +24,4 @@ class CompanyTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(14, strlen($companyRegNo));
         $this->assertRegExp('#^\d{4}/\d{6}/\d{2}$#', $companyRegNo);
     }
-}
+}

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\en_ZA\Person;
 use Faker\Provider\en_ZA\Internet;
 use Faker\Provider\en_ZA\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/en_ZA/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\en_ZA;
 
 use Faker\Generator;
 use Faker\Provider\en_ZA\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     private $faker;
 
@@ -62,4 +63,4 @@ class PhoneNumberTest extends \PHPUnit_Framework_TestCase
             $this->assertRegExp('/^(\+27|27)?(\()?0?([6][0-4]|[7][1-9]|[8][1-9])(\))?( |-|\.|_)?(\d{3})( |-|\.|_)?(\d{4})/', $number);
         }
     }
-}
+}

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/es_ES/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\es_ES;
 
 use Faker\Generator;
 use Faker\Provider\es_ES\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {
@@ -35,4 +36,11 @@ class PersonTest extends \PHPUnit_Framework_TestCase
 
         return strtoupper($letter) === $map[((int) $number) % 23];
     }
+
+    public function testLicenceCode()
+    {
+        $validLicenceCodes = array('AM', 'A1', 'A2', 'A','B', 'B+E', 'C1', 'C1+E', 'C', 'C+E', 'D1', 'D1+E', 'D', 'D+E');
+
+        $this->assertContains($this->faker->licenceCode, $validLicenceCodes);
+    }
 }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/fi_FI/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\fi_FI\Person;
 use Faker\Provider\fi_FI\Internet;
 use Faker\Provider\fi_FI\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/fr_BE/PaymentTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\fr_BE;
 
 use Faker\Generator;
 use Faker\Provider\fr_BE\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     /**
      * @var Generator

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/AddressTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\fr_CH;
 use Faker\Generator;
 use Faker\Provider\fr_CH\Address;
 use Faker\Provider\fr_CH\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\fr_CH\Person;
 use Faker\Provider\fr_CH\Internet;
 use Faker\Provider\fr_CH\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/fr_CH/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\fr_CH;
 
 use Faker\Generator;
 use Faker\Provider\fr_CH\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/fr_FR/CompanyTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\fr_FR;
 use Faker\Calculator\Luhn;
 use Faker\Generator;
 use Faker\Provider\fr_FR\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     private $faker;
 

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/id_ID/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\id_ID;
 
 use Faker\Generator;
 use Faker\Provider\id_ID\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/AddressTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\it_CH;
 use Faker\Generator;
 use Faker\Provider\it_CH\Address;
 use Faker\Provider\it_CH\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/InternetTest.php

@@ -6,8 +6,9 @@ use Faker\Generator;
 use Faker\Provider\it_CH\Person;
 use Faker\Provider\it_CH\Internet;
 use Faker\Provider\it_CH\Company;
+use PHPUnit\Framework\TestCase;
 
-class InternetTest extends \PHPUnit_Framework_TestCase
+class InternetTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/it_CH/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\it_CH;
 
 use Faker\Generator;
 use Faker\Provider\it_CH\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/CompanyTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\it_IT;
 
 use Faker\Generator;
 use Faker\Provider\it_IT\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     public function setUp()
     {
@@ -19,5 +20,5 @@ class CompanyTest extends \PHPUnit_Framework_TestCase
         $vatId = $this->faker->vatId();
         $this->assertRegExp('/^IT[0-9]{11}$/', $vatId);
     }
-    
+
 }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/it_IT/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\it_IT;
 
 use Faker\Generator;
 use Faker\Provider\it_IT\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function setUp()
     {
@@ -19,5 +20,5 @@ class PersonTest extends \PHPUnit_Framework_TestCase
         $taxId = $this->faker->taxId();
         $this->assertRegExp('/^[a-zA-Z]{6}[0-9]{2}[a-zA-Z][0-9]{2}[a-zA-Z][0-9]{3}[a-zA-Z]$/', $taxId);
     }
-    
+
 }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ja_JP/PersonTest.php

@@ -4,25 +4,44 @@ namespace Faker\Test\Provider\ja_JP;
 
 use Faker\Generator;
 use Faker\Provider\ja_JP\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
-    public function testKanaNameReturnsAotaMinoru()
+    public function testKanaNameMaleReturns()
     {
         $faker = new Generator();
         $faker->addProvider(new Person($faker));
         $faker->seed(1);
 
-        $this->assertEquals('アオタ ミノル', $faker->kanaName);
+        $this->assertEquals('アオタ ミノル', $faker->kanaName('male'));
     }
 
-    public function testFirstKanaNameReturnsHaruka()
+    public function testKanaNameFemaleReturns()
     {
         $faker = new Generator();
         $faker->addProvider(new Person($faker));
         $faker->seed(1);
 
-        $this->assertEquals('ハルカ', $faker->firstKanaName);
+        $this->assertEquals('アオタ ミキ', $faker->kanaName('female'));
+    }
+
+    public function testFirstKanaNameMaleReturns()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Person($faker));
+        $faker->seed(1);
+
+        $this->assertEquals('ヒデキ', $faker->firstKanaName('male'));
+    }
+
+    public function testFirstKanaNameFemaleReturns()
+    {
+        $faker = new Generator();
+        $faker->addProvider(new Person($faker));
+        $faker->seed(1);
+
+        $this->assertEquals('マアヤ', $faker->firstKanaName('female'));
     }
 
     public function testLastKanaNameReturnsNakajima()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/mn_MN/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\mn_MN;
 
 use Faker\Generator;
 use Faker\Provider\mn_MN\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     public function testName()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/nl_BE/PaymentTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\nl_BE;
 
 use Faker\Generator;
 use Faker\Provider\nl_BE\Payment;
+use PHPUnit\Framework\TestCase;
 
-class PaymentTest extends \PHPUnit_Framework_TestCase
+class PaymentTest extends TestCase
 {
     /**
      * @var Generator

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/nl_NL/CompanyTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\nl_NL;
 
 use Faker\Generator;
 use Faker\Provider\nl_NL\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
     private $faker;
 

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/CompanyTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_BR;
 
 use Faker\Generator;
 use Faker\Provider\pt_BR\Company;
+use PHPUnit\Framework\TestCase;
 
-class CompanyTest extends \PHPUnit_Framework_TestCase
+class CompanyTest extends TestCase
 {
 
     public function setUp()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/pt_BR/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_BR;
 
 use Faker\Generator;
 use Faker\Provider\pt_BR\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
 
     public function setUp()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/AddressTest.php

@@ -4,8 +4,10 @@ namespace Faker\Test\Provider\pt_PT;
 
 use Faker\Generator;
 use Faker\Provider\pt_PT\Address;
+use Faker\Provider\pt_PT\Person;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**
@@ -27,4 +29,12 @@ class AddressTest extends \PHPUnit_Framework_TestCase
         $postcode = $this->faker->postcode();
         $this->assertSame(preg_match($pattern, $postcode), 1, $postcode);
     }
+
+    public function testAddressIsSingleLine()
+    {
+        $this->faker->addProvider(new Person($this->faker));
+
+        $address = $this->faker->address();
+        $this->assertFalse(strstr($address, "\n"));
+    }
 }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PersonTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_PT;
 
 use Faker\Generator;
 use Faker\Provider\pt_PT\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
 
     public function setUp()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/pt_PT/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\pt_PT;
 
 use Faker\Generator;
 use Faker\Provider\pt_PT\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     public function setUp()
     {

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PersonTest.php

@@ -5,87 +5,244 @@ namespace Faker\Test\Provider\ro_RO;
 use Faker\Generator;
 use Faker\Provider\DateTime;
 use Faker\Provider\ro_RO\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
-    const TEST_CNP_REGEX = '/^([1-9])([0-9]{2}(?:0[1-9]|1[012])(?:0[1-9]|[12][0-9]|3[01]))(0[1-9]|[123][0-9]|4[0-6]|5[12])([0-9]{3})([0-9])$/';
+    const TEST_CNP_REGEX = '/^[1-9][0-9]{2}(?:0[1-9]|1[012])(?:0[1-9]|[12][0-9]|3[01])(?:0[1-9]|[123][0-9]|4[0-6]|5[12])[0-9]{3}[0-9]$/';
+
+    /**
+     * @var \Faker\Generator
+     *
+     */
+    protected $faker;
 
     public function setUp()
     {
         $faker = new Generator();
-        $faker->seed(1);
         $faker->addProvider(new DateTime($faker));
         $faker->addProvider(new Person($faker));
+        $faker->setDefaultTimezone('Europe/Bucharest');
         $this->faker = $faker;
     }
 
-    public function testCnpReturnsValidCnp()
+    public function tearDown()
+    {
+        $this->faker->setDefaultTimezone();
+    }
+
+    public function invalidGenderProvider()
+    {
+        return array(
+            array('elf'),
+            array('ent'),
+            array('fmle'),
+            array('mal'),
+        );
+    }
+
+    public function invalidYearProvider()
+    {
+        return array(
+            array(1652),
+            array(1799),
+            array(2100),
+            array(2252),
+        );
+    }
+
+    public function validYearProvider()
+    {
+        return array(
+            array(null),
+            array(''),
+            array(1800),
+            array(1850),
+            array(1900),
+            array(1990),
+            array(2000),
+            array(2099),
+        );
+    }
+
+    public function validCountyCodeProvider()
+    {
+        return array(
+            array('AB'), array('AR'), array('AG'), array('B'), array('BC'), array('BH'), array('BN'), array('BT'),
+            array('BV'), array('BR'), array('BZ'), array('CS'), array('CL'), array('CJ'), array('CT'), array('CV'),
+            array('DB'), array('DJ'), array('GL'), array('GR'), array('GJ'), array('HR'), array('HD'), array('IL'),
+            array('IS'), array('IF'), array('MM'), array('MH'), array('MS'), array('NT'), array('OT'), array('PH'),
+            array('SM'), array('SJ'), array('SB'), array('SV'), array('TR'), array('TM'), array('TL'), array('VS'),
+            array('VL'), array('VN'), array('B1'), array('B2'), array('B3'), array('B4'), array('B5'), array('B6')
+        );
+    }
+
+    public function invalidCountyCodeProvider()
+    {
+        return array(
+            array('JK'), array('REW'), array('x'), array('FF'), array('aaaddadaada')
+        );
+    }
+
+    public function validInputDataProvider()
+    {
+        return array(
+            array(Person::GENDER_MALE, '1981-06-16','B2', true, '181061642'),
+            array(Person::GENDER_FEMALE, '1981-06-16','B2', true, '281061642'),
+            array(Person::GENDER_MALE, '1981-06-16','B2', false, '981061642'),
+            array(Person::GENDER_FEMALE, '1981-06-16','B2', false, '981061642'),
+        );
+    }
+    /**
+     *
+     */
+    public function test_allRandom_returnsValidCnp()
     {
         $cnp = $this->faker->cnp;
-        $this->assertTrue($this->isValidCnp($cnp));
+        $this->assertTrue(
+            $this->isValidCnp($cnp),
+            sprintf("Invalid CNP '%' generated", $cnp)
+        );
     }
 
-    public function testCnpReturnsMaleCnp()
+    /**
+     *
+     */
+    public function test_validGender_returnsValidCnp()
     {
-        $cnp = $this->faker->cnp('m');
-        $this->assertRegExp('/^[1357]\d{12}$/', $cnp);
+        $cnp = $this->faker->cnp(Person::GENDER_MALE);
+        $this->assertTrue(
+            $this->isValidMaleCnp($cnp),
+            sprintf("Invalid CNP '%' generated for '%s' gender", $cnp, Person::GENDER_MALE)
+        );
+
+        $cnp = $this->faker->cnp(Person::GENDER_FEMALE);
+        $this->assertTrue(
+            $this->isValidFemaleCnp($cnp),
+            sprintf("Invalid CNP '%' generated for '%s' gender", $cnp, Person::GENDER_FEMALE)
+        );
     }
 
-    public function testCnpReturnsFemaleCnp()
+    /**
+     * @param string $value
+     *
+     * @dataProvider invalidGenderProvider
+     */
+    public function test_invalidGender_throwsException($value)
     {
-        $cnp = $this->faker->cnp('f');
-        $this->assertRegExp('/^[2468]\d{12}$/', $cnp);
+        $this->setExpectedException('InvalidArgumentException');
+        $this->faker->cnp($value);
     }
 
-    public function testCnpReturns1800sCnp()
+    /**
+     * @param string $value year of birth
+     *
+     * @dataProvider validYearProvider
+     */
+    public function test_validYear_returnsValidCnp($value)
     {
-        $cnp = $this->faker->cnp(null, 1800);
-        $this->assertRegExp('/^[34]\d{12}$/', $cnp);
+        $cnp = $this->faker->cnp(null, $value);
+        $this->assertTrue(
+            $this->isValidCnp($cnp),
+            sprintf("Invalid CNP '%' generated for valid year '%s'", $cnp, $value)
+        );
     }
 
-    public function testCnpReturns1900sCnp()
+    /**
+     * @param string $value year of birth
+     *
+     * @dataProvider invalidYearProvider
+     */
+    public function test_invalidYear_throwsException($value)
     {
-        $cnp = $this->faker->cnp(null, 1900);
-        $this->assertRegExp('/^[12]\d{12}$/', $cnp);
+        $this->setExpectedException('InvalidArgumentException');
+        $this->faker->cnp(null, $value);
     }
 
-    public function testCnpReturns2000sCnp()
+    /**
+     * @param $value
+     * @dataProvider validCountyCodeProvider
+     */
+    public function test_validCountyCode_returnsValidCnp($value)
     {
-        $cnp = $this->faker->cnp(null, 2000);
-        $this->assertRegExp('/^[56]\d{12}$/', $cnp);
+        $cnp = $this->faker->cnp(null, null, $value);
+        $this->assertTrue(
+            $this->isValidCnp($cnp),
+            sprintf("Invalid CNP '%' generated for valid year '%s'", $cnp, $value)
+        );
     }
 
-    public function testCnpReturnsBrasovCnp()
+    /**
+     * @param $value
+     * @dataProvider invalidCountyCodeProvider
+     */
+    public function test_invalidCountyCode_throwsException($value)
     {
-        $cnp = $this->faker->cnp(null, null, 'BV');
-        $this->assertRegExp('/^\d{7}08\d{4}$/', $cnp);
+        $this->setExpectedException('InvalidArgumentException');
+        $this->faker->cnp(null, null, $value);
     }
 
-    public function testCnpReturns2000sClujFemaleCnp()
+    /**
+     *
+     */
+    public function test_nonResident_returnsValidCnp()
     {
-        $cnp = $this->faker->cnp('f', 2000, 'CJ');
-        $this->assertRegExp('/^6\d{6}12\d{4}$/', $cnp);
+        $cnp = $this->faker->cnp(null, null, null, false);
+        $this->assertTrue(
+            $this->isValidCnp($cnp),
+            sprintf("Invalid CNP '%' generated for non resident", $cnp)
+        );
+        $this->assertStringStartsWith(
+            '9',
+            $cnp,
+            sprintf("Invalid CNP '%' generated for non resident (should start with 9)", $cnp)
+        );
+    }
+
+    /**
+     *
+     * @param $gender
+     * @param $dateOfBirth
+     * @param $county
+     * @param $isResident
+     * @param $expectedCnpStart
+     *
+     * @dataProvider validInputDataProvider
+     */
+    public function test_validInputData_returnsValidCnp($gender, $dateOfBirth, $county, $isResident, $expectedCnpStart)
+    {
+        $cnp = $this->faker->cnp($gender, $dateOfBirth, $county, $isResident);
+        $this->assertStringStartsWith(
+            $expectedCnpStart,
+            $cnp,
+            sprintf("Invalid CNP '%' generated for non valid data", $cnp)
+        );
+    }
+
+
+    protected function isValidFemaleCnp($value)
+    {
+        return $this->isValidCnp($value) && in_array($value[0], array(2, 4, 6, 8, 9));
+    }
+
+    protected function isValidMaleCnp($value)
+    {
+        return $this->isValidCnp($value) && in_array($value[0], array(1, 3, 5, 7, 9));
     }
 
     protected function isValidCnp($cnp)
     {
-        if (
-            is_string($cnp)
-            && (bool) preg_match(static::TEST_CNP_REGEX, $cnp)
-            && checkdate(substr($cnp, 3, 2), substr($cnp, 5, 2), substr($cnp, 1, 2))
-        ){
+        if (preg_match(static::TEST_CNP_REGEX, $cnp) !== false) {
             $checkNumber = 279146358279;
 
             $checksum = 0;
             foreach (range(0, 11) as $digit) {
-                $checksum += substr($cnp, $digit, 1) * substr($checkNumber, $digit, 1);
+                $checksum += (int)substr($cnp, $digit, 1) * (int)substr($checkNumber, $digit, 1);
             }
             $checksum = $checksum % 11;
+            $checksum = $checksum == 10 ? 1 : $checksum;
 
-            if (
-                ($checksum < 10 && $checksum == substr($cnp, -1))
-                || ($checksum == 10 && substr($cnp, -1) == 1)
-            ){
+            if ($checksum == substr($cnp, -1)) {
                 return true;
             }
         }

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/ro_RO/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\ro_RO;
 
 use Faker\Generator;
 use Faker\Provider\ro_RO\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
     public function setUp()
     {
@@ -21,7 +22,7 @@ class PhoneNumberTest extends \PHPUnit_Framework_TestCase
 
     public function testTollFreePhoneNumberReturnsTollFreePhoneNumber()
     {
-        $this->assertRegExp('/^08(?:0[1267]|70)\d{6}$/', $this->faker->tollFreePhoneNumber());
+        $this->assertRegExp('/^08(?:0[01267]|70)\d{6}$/', $this->faker->tollFreePhoneNumber());
     }
 
     public function testPremiumRatePhoneNumberReturnsPremiumRatePhoneNumber()

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/sv_SE/PersonTest.php

@@ -5,8 +5,9 @@ namespace Faker\Test\Provider\sv_SE;
 use Faker\Calculator\Luhn;
 use Faker\Generator;
 use Faker\Provider\sv_SE\Person;
+use PHPUnit\Framework\TestCase;
 
-class PersonTest extends \PHPUnit_Framework_TestCase
+class PersonTest extends TestCase
 {
     /** @var Generator */
     protected $faker;

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/AddressTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\uk_UA;
 
 use Faker\Generator;
 use Faker\Provider\uk_UA\Address;
+use PHPUnit\Framework\TestCase;
 
-class AddressTest extends \PHPUnit_Framework_TestCase
+class AddressTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/uk_UA/PhoneNumberTest.php

@@ -4,8 +4,9 @@ namespace Faker\Test\Provider\uk_UA;
 
 use Faker\Generator;
 use Faker\Provider\uk_UA\PhoneNumber;
+use PHPUnit\Framework\TestCase;
 
-class PhoneNumberTest extends \PHPUnit_Framework_TestCase
+class PhoneNumberTest extends TestCase
 {
 
     /**

pfosten/vendor/fzaninotto/faker/test/Faker/Provider/zh_TW/TextTest.php

@@ -2,7 +2,9 @@
 
 namespace Faker\Test\Provider\zh_TW;
 
-class TextTest extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TextTest extends TestCase
 {
     private $textClass;
 
@@ -20,7 +22,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
     }
 
     /** @test */
-    function it_should_explode_the_string_to_array()
+    function testItShouldExplodeTheStringToArray()
     {
         $this->assertSame(
             array('中', '文', '測', '試', '真', '有', '趣'),
@@ -34,7 +36,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
     }
 
     /** @test */
-    function it_should_return_the_string_length()
+    function testItShouldReturnTheStringLength()
     {
         $this->assertContains(
             $this->getMethod('strlen')->invokeArgs(null, array('中文測試真有趣')),
@@ -43,7 +45,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
     }
 
     /** @test */
-    function it_should_return_the_character_is_valid_start_or_not()
+    function testItShouldReturnTheCharacterIsValidStartOrNot()
     {
         $this->assertTrue($this->getMethod('validStart')->invokeArgs(null, array('中')));
 
@@ -57,7 +59,7 @@ class TextTest extends \PHPUnit_Framework_TestCase
     }
 
     /** @test */
-    function it_should_append_end_punct_to_the_end_of_string()
+    function testItShouldAppendEndPunctToTheEndOfString()
     {
         $this->assertSame(
             '中文測試真有趣。',