From 156a57959cfc6f94430d69123b0968d176025f5c Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Mon, 3 Feb 2020 17:24:07 +0900 Subject: [PATCH 01/12] Update .travis.yml to use Precise distribution https://docs.travis-ci.com/user/languages/php/#choosing-php-versions-to-test-against --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6dd21b2..5e962a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: php +dist: precise php: - 5.3 From 6edd83702915cb5de9c0e3f0b3a6f0c234e268a1 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Mon, 3 Feb 2020 17:25:37 +0900 Subject: [PATCH 02/12] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5e962a3..61e6a0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ php: - 5.5 - 5.6 - hhvm + dist: trusty install: - travis_retry composer install --no-interaction --prefer-source From 87ec56fdaadac4e238ce2c07128ab3751e72f2ba Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Mon, 3 Feb 2020 17:26:34 +0900 Subject: [PATCH 03/12] Update .travis.yml --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61e6a0e..5771a92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ php: - 5.4 - 5.5 - 5.6 - - hhvm - dist: trusty install: - travis_retry composer install --no-interaction --prefer-source @@ -15,7 +13,10 @@ install: script: - vendor/bin/phpunit -matrix: +jobs: + include: + - php: hhvm + dist: trusty allow_failures: - php: hhvm fast_finish: true From 18bc6fdf3e11fc89027145ecc24f9a2e4576cb51 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 01:33:54 +0900 Subject: [PATCH 04/12] Update .travis.yml --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5771a92..f305135 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,4 @@ language: php -dist: precise - -php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 install: - travis_retry composer install --no-interaction --prefer-source @@ -15,6 +8,14 @@ script: jobs: include: + - php: 5.3 + dist: precise + - php: 5.4 + dist: trusty + - php: 5.5 + dist: trusty + - php: 5.6 + dist: xenial - php: hhvm dist: trusty allow_failures: From 6b0631e7897e4f6da5f16613066bc1bc527c5640 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 08:42:30 +0900 Subject: [PATCH 05/12] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f305135..cc9dc17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,8 @@ jobs: dist: trusty - php: 5.6 dist: xenial - - php: hhvm + - php: hhvm-3.18 dist: trusty allow_failures: - - php: hhvm + - php: hhvm-3.18 fast_finish: true From c1dde64ba8a14f0703a0ee591fc45f4cbd1b0342 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 13:05:00 +0900 Subject: [PATCH 06/12] Update PasswordHashTest.php --- test/Unit/PasswordHashTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Unit/PasswordHashTest.php b/test/Unit/PasswordHashTest.php index abe9109..dc4c712 100644 --- a/test/Unit/PasswordHashTest.php +++ b/test/Unit/PasswordHashTest.php @@ -35,6 +35,10 @@ public function testNullBehavior() { } public function testIntegerBehavior() { + if (defined('HHVM_VERSION')) { + $this->markTestSkipped("HHVM does not support integer arguments"); + } + $hash = password_hash(12345, PASSWORD_BCRYPT, array("salt" => "1234567890123456789012345678901234567890")); $this->assertEquals('$2y$10$123456789012345678901ujczD5TiARVFtc68bZCAlbEg1fCIexfO', $hash); } From eb5fa35a40dce44c2435d1cf888134e3b333c062 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 13:05:37 +0900 Subject: [PATCH 07/12] Update PasswordVerifyTest.php --- test/Unit/PasswordVerifyTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/Unit/PasswordVerifyTest.php b/test/Unit/PasswordVerifyTest.php index 9f67bb9..6d151bb 100644 --- a/test/Unit/PasswordVerifyTest.php +++ b/test/Unit/PasswordVerifyTest.php @@ -7,6 +7,10 @@ public function testFuncExists() { } public function testFailedType() { + if (defined('HHVM_VERSION')) { + $this->markTestSkipped("HHVM does not support integer arguments"); + } + $this->assertFalse(password_verify(123, 123)); } @@ -26,4 +30,4 @@ public function testInValidHash() { $this->assertFalse(password_verify('rasmuslerdorf', '$2a$07$usesomesillystringfore2uDLvp1Ii2e./U9C8sBjqp8I90dH6hj')); } -} \ No newline at end of file +} From 8a6bb9f5a0bff2095af66adb8acbdd1a0a501887 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 13:05:53 +0900 Subject: [PATCH 08/12] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc9dc17..ee98f8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,4 @@ jobs: dist: xenial - php: hhvm-3.18 dist: trusty - allow_failures: - - php: hhvm-3.18 fast_finish: true From 212f710bec1528252efa960793fbe1cba1987f08 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 18:24:38 +0900 Subject: [PATCH 09/12] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ee98f8b..6ad8d64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,6 @@ jobs: dist: trusty - php: 5.6 dist: xenial - - php: hhvm-3.18 + - php: hhvm-2.3 dist: trusty fast_finish: true From 3e379f440e7c8e62bb6cf48e95c367a949567de8 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 18:31:13 +0900 Subject: [PATCH 10/12] Update PasswordHashTest.php --- test/Unit/PasswordHashTest.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/Unit/PasswordHashTest.php b/test/Unit/PasswordHashTest.php index dc4c712..abe9109 100644 --- a/test/Unit/PasswordHashTest.php +++ b/test/Unit/PasswordHashTest.php @@ -35,10 +35,6 @@ public function testNullBehavior() { } public function testIntegerBehavior() { - if (defined('HHVM_VERSION')) { - $this->markTestSkipped("HHVM does not support integer arguments"); - } - $hash = password_hash(12345, PASSWORD_BCRYPT, array("salt" => "1234567890123456789012345678901234567890")); $this->assertEquals('$2y$10$123456789012345678901ujczD5TiARVFtc68bZCAlbEg1fCIexfO', $hash); } From 5f9c6e2dd157f487285c349bc64e0914e37d2314 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 18:31:33 +0900 Subject: [PATCH 11/12] Update PasswordVerifyTest.php --- test/Unit/PasswordVerifyTest.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/Unit/PasswordVerifyTest.php b/test/Unit/PasswordVerifyTest.php index 6d151bb..35c3642 100644 --- a/test/Unit/PasswordVerifyTest.php +++ b/test/Unit/PasswordVerifyTest.php @@ -7,10 +7,6 @@ public function testFuncExists() { } public function testFailedType() { - if (defined('HHVM_VERSION')) { - $this->markTestSkipped("HHVM does not support integer arguments"); - } - $this->assertFalse(password_verify(123, 123)); } From 98c3b0982c8c1fd3993ed17c96530f461f752620 Mon Sep 17 00:00:00 2001 From: Alexey Kopytko Date: Tue, 4 Feb 2020 18:32:39 +0900 Subject: [PATCH 12/12] Remove HHVM from Travis --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ad8d64..80cf5fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,4 @@ jobs: dist: trusty - php: 5.6 dist: xenial - - php: hhvm-2.3 - dist: trusty fast_finish: true