From ce2c02a6ad5e5765832980fc4bc9f7af0195468d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Feb 2019 14:16:10 +0100 Subject: From fedora: - Fix FTBFS by skipping flakey test (RHBZ #1605437 / RHBZ #1675661) - Reference patches locally - Remove invalid phpdoc @return from autoloader --- php-Faker-github-pull-request-1348.patch | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 php-Faker-github-pull-request-1348.patch (limited to 'php-Faker-github-pull-request-1348.patch') diff --git a/php-Faker-github-pull-request-1348.patch b/php-Faker-github-pull-request-1348.patch new file mode 100644 index 0000000..635da1b --- /dev/null +++ b/php-Faker-github-pull-request-1348.patch @@ -0,0 +1,45 @@ +From cd1d5dd8a603eab9e02e331b61aa60e6cf6f8c78 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Fri, 10 Nov 2017 11:48:37 +0100 +Subject: [PATCH] only test available date range on 32-bit + +--- + test/Faker/Provider/fi_FI/PersonTest.php | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/test/Faker/Provider/fi_FI/PersonTest.php b/test/Faker/Provider/fi_FI/PersonTest.php +index 5aefb8584..b979666e9 100644 +--- a/test/Faker/Provider/fi_FI/PersonTest.php ++++ b/test/Faker/Provider/fi_FI/PersonTest.php +@@ -44,18 +44,25 @@ public function testPersonalIdentityNumberUsesBirthDateIfProvided($seed, $birthd + + public function testPersonalIdentityNumberGeneratesCompliantNumbers() + { +- for ($i = 0; $i < 10; $i++) { +- $birthdate = $this->faker->dateTimeBetween('1800-01-01 00:00:00', '1899-12-31 23:59:59'); +- $pin = $this->faker->personalIdentityNumber($birthdate); +- $this->assertRegExp('/^[0-9]{6}\+[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin); ++ if (strtotime('1800-01-01 00:00:00')) { ++ $min="1900"; ++ $max="2099"; ++ for ($i = 0; $i < 10; $i++) { ++ $birthdate = $this->faker->dateTimeBetween('1800-01-01 00:00:00', '1899-12-31 23:59:59'); ++ $pin = $this->faker->personalIdentityNumber($birthdate, NULL, true); ++ $this->assertRegExp('/^[0-9]{6}\+[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin); ++ } ++ } else { // timestamp limit for 32-bit computer ++ $min="1902"; ++ $max="2037"; + } + for ($i = 0; $i < 10; $i++) { +- $birthdate = $this->faker->dateTimeBetween('1900-01-01 00:00:00', '1999-12-31 23:59:59'); ++ $birthdate = $this->faker->dateTimeBetween("$min-01-01 00:00:00", '1999-12-31 23:59:59'); + $pin = $this->faker->personalIdentityNumber($birthdate); + $this->assertRegExp('/^[0-9]{6}-[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin); + } + for ($i = 0; $i < 10; $i++) { +- $birthdate = $this->faker->dateTimeBetween('2000-01-01 00:00:00', '2099-12-31 23:59:59'); ++ $birthdate = $this->faker->dateTimeBetween('2000-01-01 00:00:00', "$max-12-31 23:59:59"); + $pin = $this->faker->personalIdentityNumber($birthdate); + $this->assertRegExp('/^[0-9]{6}A[0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/', $pin); + } -- cgit