From f3e0fed2d736f8d34b113d4c16e8f6bb281147c9 Mon Sep 17 00:00:00 2001 From: Martin Hujer Date: Fri, 10 Nov 2017 09:41:09 +0100 Subject: [PATCH] Drop remnants of HHVM from tests It was removed from Travis in c479cdd42f53c98b7f93209131c37b436503f808 --- tests/Generator/DefaultTimeGeneratorTest.php | 5 +---- tests/Generator/OpenSslGeneratorTest.php | 6 ------ tests/Generator/PeclUuidTestCase.php | 6 ------ tests/Generator/RandomBytesGeneratorTest.php | 6 ------ tests/Provider/Node/RandomNodeProviderTest.php | 6 ------ tests/Provider/Node/SystemNodeProviderTest.php | 2 -- tests/Provider/Time/SystemTimeProviderTest.php | 1 - tests/TestCase.php | 16 +--------------- tests/bootstrap.php | 12 +++++------- tools/hhvm-docker/Dockerfile | 13 ------------- 10 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 tools/hhvm-docker/Dockerfile diff --git a/tests/Generator/DefaultTimeGeneratorTest.php b/tests/Generator/DefaultTimeGeneratorTest.php index b12f6b5..d5d3e38 100644 --- a/tests/Generator/DefaultTimeGeneratorTest.php +++ b/tests/Generator/DefaultTimeGeneratorTest.php @@ -45,9 +45,7 @@ class DefaultTimeGeneratorTest extends TestCase $this->nodeProvider = null; $this->timeConverter = null; Mockery::close(); - if (!self::isHhvm()) { - AspectMock::clean(); - } + AspectMock::clean(); } public function testGenerateUsesNodeProviderWhenNodeIsNull() @@ -165,7 +163,6 @@ class DefaultTimeGeneratorTest extends TestCase */ public function testGenerateUsesRandomSequenceWhenClockSeqNull() { - $this->skipIfHhvm(); $mt_rand = AspectMock::func('Ramsey\Uuid\Generator', 'random_int', 9622); $defaultTimeGenerator = new DefaultTimeGenerator( $this->nodeProvider, diff --git a/tests/Generator/OpenSslGeneratorTest.php b/tests/Generator/OpenSslGeneratorTest.php index 5fae9de..d83c4d1 100644 --- a/tests/Generator/OpenSslGeneratorTest.php +++ b/tests/Generator/OpenSslGeneratorTest.php @@ -13,12 +13,6 @@ use AspectMock\Test as AspectMock; */ class OpenSslGeneratorTest extends TestCase { - protected function setUp() - { - $this->skipIfHhvm(); - parent::setUp(); - } - public function lengthAndHexDataProvider() { return [ diff --git a/tests/Generator/PeclUuidTestCase.php b/tests/Generator/PeclUuidTestCase.php index 357e15f..3a45e90 100644 --- a/tests/Generator/PeclUuidTestCase.php +++ b/tests/Generator/PeclUuidTestCase.php @@ -15,10 +15,4 @@ class PeclUuidTestCase extends TestCase { protected $uuidString = 'b08c6fff-7dc5-e111-9b21-0800200c9a66'; protected $uuidBinary = '62303863366666662d376463352d653131312d396232312d303830303230306339613636'; - - protected function setUp() - { - $this->skipIfHhvm(); - parent::setUp(); - } } diff --git a/tests/Generator/RandomBytesGeneratorTest.php b/tests/Generator/RandomBytesGeneratorTest.php index 9d008f8..b7bf593 100644 --- a/tests/Generator/RandomBytesGeneratorTest.php +++ b/tests/Generator/RandomBytesGeneratorTest.php @@ -13,12 +13,6 @@ use AspectMock\Test as AspectMock; */ class RandomBytesGeneratorTest extends TestCase { - protected function setUp() - { - $this->skipIfHhvm(); - parent::setUp(); - } - public function lengthAndHexDataProvider() { return [ diff --git a/tests/Provider/Node/RandomNodeProviderTest.php b/tests/Provider/Node/RandomNodeProviderTest.php index 53b56bb..964c15f 100644 --- a/tests/Provider/Node/RandomNodeProviderTest.php +++ b/tests/Provider/Node/RandomNodeProviderTest.php @@ -8,12 +8,6 @@ use AspectMock\Test as AspectMock; class RandomNodeProviderTest extends TestCase { - protected function setUp() - { - $this->skipIfHhvm(); - parent::setUp(); - } - protected function tearDown() { parent::tearDown(); diff --git a/tests/Provider/Node/SystemNodeProviderTest.php b/tests/Provider/Node/SystemNodeProviderTest.php index ef24887..20acad1 100644 --- a/tests/Provider/Node/SystemNodeProviderTest.php +++ b/tests/Provider/Node/SystemNodeProviderTest.php @@ -268,8 +268,6 @@ class SystemNodeProviderTest extends TestCase */ public function testGetNodeGetsNetworkInterfaceConfig($os, $command) { - $this->skipIfHhvm(); - /*/ Arrange /*/ $this->arrangeMockFunctions( 'whatever', diff --git a/tests/Provider/Time/SystemTimeProviderTest.php b/tests/Provider/Time/SystemTimeProviderTest.php index 3263e2f..8210efd 100644 --- a/tests/Provider/Time/SystemTimeProviderTest.php +++ b/tests/Provider/Time/SystemTimeProviderTest.php @@ -23,7 +23,6 @@ class SystemTimeProviderTest extends TestCase */ public function testCurrentTimeUsesGettimeofday() { - $this->skipIfHhvm(); $timestamp = ['sec' => 1458844556, 'usec' => 200997]; $func = AspectMock::func('Ramsey\Uuid\Provider\Time', 'gettimeofday', $timestamp); $provider = new SystemTimeProvider(); diff --git a/tests/TestCase.php b/tests/TestCase.php index 3bbf3c6..5a1cd05 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -10,9 +10,7 @@ class TestCase extends PhpUnitTestCase protected function tearDown() { parent::tearDown(); - if (!self::isHhvm()) { - AspectMock::clean(); - } + AspectMock::clean(); Mockery::close(); } @@ -61,16 +59,4 @@ class TestCase extends PhpUnitTestCase { return current(unpack('v', pack('S', 0x00FF))) === 0x00FF; } - - protected function skipIfHhvm() - { - if (self::isHhvm()) { - $this->markTestSkipped('Skipping test that cannot run on HHVM'); - } - } - - protected static function isHhvm() - { - return defined('HHVM_VERSION'); - } } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index deb7d0c..7783347 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,10 +1,8 @@ init([ - 'debug' => true, - 'includePaths' => [__DIR__ . '/../src'] - ]); -} +$kernel = \AspectMock\Kernel::getInstance(); +$kernel->init([ + 'debug' => true, + 'includePaths' => [__DIR__ . '/../src'] +]); diff --git a/tools/hhvm-docker/Dockerfile b/tools/hhvm-docker/Dockerfile deleted file mode 100644 index f503e92..0000000 --- a/tools/hhvm-docker/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM benramsey/hhvm-dev:3.12.0 - -RUN apt-get update -y && apt-get install -y build-essential curl wget git uuid-dev libuuid1 -RUN wget https://github.com/vipsoft/hhvm-ext-uuid/archive/ba0ebae0fe.tar.gz \ - && tar zxf ba0ebae0fe.tar.gz \ - && cd hhvm-ext-uuid-ba0ebae0fe123e8545ea02110db2f0102c08d637/ \ - && hphpize \ - && cmake . \ - && make \ - && cp uuid.so /etc/hhvm/ext/uuid.so \ - && printf "hhvm.dynamic_extensions[uuid] = uuid.so\n" >> /etc/hhvm/php.ini -RUN rm ba0ebae0fe.tar.gz && rm -rf hhvm-ext-uuid-ba0ebae0fe123e8545ea02110db2f0102c08d637/ -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer