From c6b8669c2c676581921dd1ae1485b21895bc4e4c Mon Sep 17 00:00:00 2001 From: Josh Sherman Date: Sun, 7 Jan 2018 22:36:46 -0600 Subject: [PATCH] Trying to fix HHVM errors Also some code cleanup --- tests/LoremIpsumTest.php | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/tests/LoremIpsumTest.php b/tests/LoremIpsumTest.php index 7b794cd..6af55f9 100644 --- a/tests/LoremIpsumTest.php +++ b/tests/LoremIpsumTest.php @@ -2,7 +2,17 @@ require_once '../src/LoremIpsum.php'; -if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) { +if ( + !class_exists('\PHPUnit_Framework_Error') + && class_exists('\PHPUnit\Framework\Error') +) { + class_alias('\PHPUnit\Framework\Error', '\PHPUnit_Framework_Error'); +} + +if ( + !class_exists('\PHPUnit_Framework_TestCase') + && class_exists('\PHPUnit\Framework\TestCase') +) { class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase'); } @@ -34,8 +44,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase $this->assertTrue(is_array($words)); $this->assertCount(3, $words); - foreach ($words as $word) - { + foreach ($words as $word) { $this->assertRegExp('/^[a-z]+$/i', $word); } } @@ -61,8 +70,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase $this->assertTrue(is_array($sentences)); $this->assertCount(3, $sentences); - foreach ($sentences as $sentence) - { + foreach ($sentences as $sentence) { $this->assertRegExp('/^[a-z, ]+\.$/i', $sentence); } } @@ -86,8 +94,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase $this->assertTrue(is_array($paragraphs)); $this->assertCount(3, $paragraphs); - foreach ($paragraphs as $paragraph) - { + foreach ($paragraphs as $paragraph) { $this->assertRegExp('/^([a-z, ]+\.)+$/i', $paragraph); } } @@ -122,8 +129,7 @@ class LoremIpsumTest extends PHPUnit_Framework_TestCase $this->assertTrue(is_array($words)); $this->assertCount(3, $words); - foreach ($words as $word) - { + foreach ($words as $word) { $this->assertRegExp('/^
  • [a-z]+<\/li>$/i', $word); } }