diff options
| -rw-r--r-- | 8f16a007ea94f65894c8c71e0aaeba83e0d13993.patch | 86 | ||||
| -rw-r--r-- | composer.json | 6 | ||||
| -rw-r--r-- | php-bacon-qr-code.spec | 17 |
3 files changed, 13 insertions, 96 deletions
diff --git a/8f16a007ea94f65894c8c71e0aaeba83e0d13993.patch b/8f16a007ea94f65894c8c71e0aaeba83e0d13993.patch deleted file mode 100644 index 6b94827..0000000 --- a/8f16a007ea94f65894c8c71e0aaeba83e0d13993.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 8f16a007ea94f65894c8c71e0aaeba83e0d13993 Mon Sep 17 00:00:00 2001 -From: Ben Scholzen <mail@dasprids.de> -Date: Sat, 26 Nov 2016 14:47:45 +0100 -Subject: [PATCH] Fix unit tests on PHP 7.1 and add PHP 5.6 to test matrix - ---- - .gitignore | 2 ++ - .travis.yml | 4 +++- - composer.json | 3 +++ - tests/BaconQrCode/Common/BitArrayTest.php | 6 +++++- - tests/BaconQrCode/Common/ReedSolomonCodecTest.php | 6 +++++- - 5 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 35c1bcd..c4fcf18 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,3 +1,5 @@ -+composer.lock -+vendor - nbproject - .idea - .buildpath -diff --git a/.travis.yml b/.travis.yml -index 4e554be..60690f0 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -3,7 +3,9 @@ php: - - 5.3 - - 5.4 - - 5.5 -+ - 5.6 - - 7.0 -+ - 7.1 - - hhvm - --script: phpunit --bootstrap tests/bootstrap.php --configuration tests/phpunit.xml tests -\ No newline at end of file -+script: ./vendor/bin/phpunit --bootstrap tests/bootstrap.php --configuration tests/phpunit.xml tests -diff --git a/composer.json b/composer.json -index 47f442d..7947259 100644 ---- a/composer.json -+++ b/composer.json -@@ -22,5 +22,8 @@ - "psr-0": { - "BaconQrCode": "src/" - } -+ }, -+ "require-dev": { -+ "phpunit/phpunit": "^5.6" - } - } -diff --git a/tests/BaconQrCode/Common/BitArrayTest.php b/tests/BaconQrCode/Common/BitArrayTest.php -index 06aa4e1..81bcbce 100644 ---- a/tests/BaconQrCode/Common/BitArrayTest.php -+++ b/tests/BaconQrCode/Common/BitArrayTest.php -@@ -94,7 +94,11 @@ public function testGetNextSet4() - - public function testGetNextSet5() - { -- mt_srand(hexdec('deadbeef')); -+ if (defined('MT_RAND_PHP')) { -+ mt_srand(0xdeadbeef, MT_RAND_PHP); -+ } else { -+ mt_srand(0xdeadbeef); -+ } - - for ($i = 0; $i < 10; $i++) { - $array = new BitArray(mt_rand(1, 100)); -diff --git a/tests/BaconQrCode/Common/ReedSolomonCodecTest.php b/tests/BaconQrCode/Common/ReedSolomonCodecTest.php -index 99a6c72..604641a 100644 ---- a/tests/BaconQrCode/Common/ReedSolomonCodecTest.php -+++ b/tests/BaconQrCode/Common/ReedSolomonCodecTest.php -@@ -38,7 +38,11 @@ public static function tabProvider() - */ - public function testCodec($symbolSize, $generatorPoly, $firstRoot, $primitive, $numRoots) - { -- mt_srand(0xdeadbeef); -+ if (defined('MT_RAND_PHP')) { -+ mt_srand(0xdeadbeef, MT_RAND_PHP); -+ } else { -+ mt_srand(0xdeadbeef); -+ } - - $blockSize = (1 << $symbolSize) - 1; - $dataSize = $blockSize - $numRoots; diff --git a/composer.json b/composer.json index 01b16bc..086f4c5 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,8 @@ "license" : "BSD-2-Clause", "homepage": "https://github.com/Bacon/BaconQrCode", "require": { - "php": ">=5.3.3" + "php": "^5.4|^7.0", + "ext-iconv": "*" }, "suggest": { "ext-gd": "to generate QR code images" @@ -21,5 +22,8 @@ "psr-0": { "BaconQrCode": "src/" } + }, + "require-dev": { + "phpunit/phpunit": "^4.8" } } diff --git a/php-bacon-qr-code.spec b/php-bacon-qr-code.spec index 6a80737..dace8d2 100644 --- a/php-bacon-qr-code.spec +++ b/php-bacon-qr-code.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 031a2ce68c5794064b49d11775b2daf45c96e21c +%global gh_commit 5a91b62b9d37cee635bbf8d553f4546057250bee %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Bacon %global gh_project BaconQrCode @@ -20,8 +20,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_project} -Version: 1.0.1 -Release: 4%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: QR code generator for PHP Group: Development/Libraries @@ -29,13 +29,10 @@ License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -# upstream patch -Patch0: https://github.com/%{gh_owner}/%{gh_project}/commit/8f16a007ea94f65894c8c71e0aaeba83e0d13993.patch - BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 5.3.3 +BuildRequires: php(language) >= 5.4 BuildRequires: php-gd BuildRequires: php-reflection BuildRequires: php-simplexml @@ -50,6 +47,7 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=5.3.3" Requires: php(language) >= 5.3.3 +Requires: php-iconv # From composer.json, "suggest": { # "ext-gd": "to generate QR code images" Requires: php-gd @@ -57,7 +55,6 @@ Requires: php-gd Requires: php-reflection Requires: php-simplexml Requires: php-ctype -Requires: php-iconv Requires: php-spl # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -79,7 +76,6 @@ Autoloader: %{php_home}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .upstream cat << 'EOF' | tee src/%{ns_project}/autoload.php <?php @@ -134,6 +130,9 @@ exit $ret %changelog +* Thu Oct 19 2017 Remi Collet <remi@remirepo.net> - 1.0.3-1 +- Update to 1.0.3 + * Mon Jul 3 2017 Remi Collet <remi@remirepo.net> - 1.0.1-4 - run test suite only on 64-bit arch |