Skip to content

Commit 326a3d3

Browse files
committed
tests: use of magic constant '::class'
1 parent ac23ee1 commit 326a3d3

File tree

4 files changed

+121
-121
lines changed

4 files changed

+121
-121
lines changed

tests/MabeEnumTest/EnumMapTest.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace MabeEnumTest;
44

5+
use InvalidArgumentException;
56
use MabeEnum\EnumMap;
67
use MabeEnumTest\TestAsset\EnumBasic;
78
use MabeEnumTest\TestAsset\EnumInheritance;
@@ -19,8 +20,8 @@ class EnumMapTest extends TestCase
1920
{
2021
public function testBasic()
2122
{
22-
$enumMap = new EnumMap('MabeEnumTest\TestAsset\EnumBasic');
23-
$this->assertSame('MabeEnumTest\TestAsset\EnumBasic', $enumMap->getEnumeration());
23+
$enumMap = new EnumMap(EnumBasic::class);
24+
$this->assertSame(EnumBasic::class, $enumMap->getEnumeration());
2425

2526
$enum1 = EnumBasic::ONE();
2627
$value1 = 'value1';
@@ -49,7 +50,7 @@ public function testBasic()
4950

5051
public function testBasicWithConstantValuesAsEnums()
5152
{
52-
$enumMap = new EnumMap('MabeEnumTest\TestAsset\EnumBasic');
53+
$enumMap = new EnumMap(EnumBasic::class);
5354

5455
$enum1 = EnumBasic::ONE;
5556
$value1 = 'value1';
@@ -78,7 +79,7 @@ public function testBasicWithConstantValuesAsEnums()
7879

7980
public function testIterate()
8081
{
81-
$enumMap = new EnumMap('MabeEnumTest\TestAsset\EnumBasic');
82+
$enumMap = new EnumMap(EnumBasic::class);
8283

8384
$enum1 = EnumBasic::ONE();
8485
$value1 = 'value1';
@@ -122,7 +123,7 @@ public function testIterate()
122123

123124
public function testArrayAccessWithObjects()
124125
{
125-
$enumMap = new EnumMap('MabeEnumTest\TestAsset\EnumBasic');
126+
$enumMap = new EnumMap(EnumBasic::class);
126127

127128
$enumMap[EnumBasic::ONE()] = 'first';
128129
$enumMap[EnumBasic::TWO()] = 'second';
@@ -141,7 +142,7 @@ public function testArrayAccessWithObjects()
141142

142143
public function testArrayAccessWithValues()
143144
{
144-
$enumMap = new EnumMap('MabeEnumTest\TestAsset\EnumBasic');
145+
$enumMap = new EnumMap(EnumBasic::class);
145146

146147
$enumMap[EnumBasic::ONE] = 'first';
147148
$enumMap[EnumBasic::TWO] = 'second';
@@ -160,21 +161,21 @@ public function testArrayAccessWithValues()
160161

161162
public function testConstructThrowsInvalidArgumentExceptionIfEnumClassDoesNotExtendBaseEnum()
162163
{
163-
$this->setExpectedException('InvalidArgumentException');
164+
$this->setExpectedException(InvalidArgumentException::class);
164165
new EnumMap('stdClass');
165166
}
166167

167168
public function testInitEnumThrowsInvalidArgumentExceptionOnInvalidEnumGiven()
168169
{
169-
$enumMap = new EnumMap('MabeEnumTest\TestAsset\EnumBasic');
170+
$enumMap = new EnumMap(EnumBasic::class);
170171

171-
$this->setExpectedException('InvalidArgumentException');
172+
$this->setExpectedException(InvalidArgumentException::class);
172173
$enumMap->offsetSet(EnumInheritance::INHERITANCE(), 'test');
173174
}
174175

175176
public function testContainsAndOffsetExistsReturnsFalseOnInvalidEnum()
176177
{
177-
$enumMap = new EnumMap('MabeEnumTest\TestAsset\EnumBasic');
178+
$enumMap = new EnumMap(EnumBasic::class);
178179

179180
$this->assertFalse($enumMap->contains(EnumInheritance::INHERITANCE()));
180181
$this->assertFalse($enumMap->contains(EnumInheritance::INHERITANCE));

tests/MabeEnumTest/EnumSerializableTraitTest.php

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
namespace MabeEnumTest;
44

5+
use LogicException;
6+
use MabeEnum\Enum;
57
use MabeEnumTest\TestAsset\SerializableEnum;
68
use PHPUnit_Framework_TestCase as TestCase;
79
use ReflectionClass;
10+
use RuntimeException;
811

912
/**
1013
* Unit tests for the trait MabeEnum\EnumSerializableTrait
@@ -15,20 +18,13 @@
1518
*/
1619
class EnumSerializableTraitTest extends TestCase
1720
{
18-
public function setUp()
19-
{
20-
if (PHP_VERSION_ID < 50400) {
21-
$this->markTestSkipped('Traits require PHP-5.4');
22-
}
23-
}
24-
2521
public function testSerializeSerializableEnum()
2622
{
2723
$serialized = serialize(SerializableEnum::get(SerializableEnum::NIL));
2824
$this->assertInternalType('string', $serialized);
2925

3026
$unserialized = unserialize($serialized);
31-
$this->assertInstanceOf('MabeEnumTest\TestAsset\SerializableEnum', $unserialized);
27+
$this->assertInstanceOf(SerializableEnum::class, $unserialized);
3228
}
3329

3430
public function testUnserializeFirstWillHoldTheSameInstance()
@@ -37,11 +33,11 @@ public function testUnserializeFirstWillHoldTheSameInstance()
3733
$this->assertInternalType('string', $serialized);
3834

3935
// clear all instantiated instances so we can virtual test unserializing first
40-
$this->clearEnumeration('MabeEnumTest\TestAsset\SerializableEnum');
36+
$this->clearEnumeration(SerializableEnum::class);
4137

4238
// First unserialize
4339
$unserialized = unserialize($serialized);
44-
$this->assertInstanceOf('MabeEnumTest\TestAsset\SerializableEnum', $unserialized);
40+
$this->assertInstanceOf(SerializableEnum::class, $unserialized);
4541

4642
// second instantiate
4743
$enum = SerializableEnum::get($unserialized->getValue());
@@ -52,19 +48,19 @@ public function testUnserializeFirstWillHoldTheSameInstance()
5248

5349
public function testUnserializeThrowsRuntimeExceptionOnUnknownValue()
5450
{
55-
$this->setExpectedException('RuntimeException');
56-
unserialize('C:39:"MabeEnumTest\TestAsset\SerializableEnum":11:{s:4:"test";}');
51+
$this->setExpectedException(RuntimeException::class);
52+
unserialize('C:' . strlen(SerializableEnum::class) . ':"' . SerializableEnum::class . '":11:{s:4:"test";}');
5753
}
5854

5955
public function testUnserializeThrowsRuntimeExceptionOnInvalidValue()
6056
{
61-
$this->setExpectedException('RuntimeException');
62-
unserialize('C:39:"MabeEnumTest\TestAsset\SerializableEnum":19:{O:8:"stdClass":0:{}}');
57+
$this->setExpectedException(RuntimeException::class);
58+
unserialize('C:' . strlen(SerializableEnum::class) . ':"' . SerializableEnum::class . '":19:{O:8:"stdClass":0:{}}');
6359
}
6460

6561
public function testUnserializeThrowsLogicExceptionOnChangingValue()
6662
{
67-
$this->setExpectedException('LogicException');
63+
$this->setExpectedException(LogicException::class);
6864
$enum = SerializableEnum::get(SerializableEnum::INT);
6965
$enum->unserialize(serialize(SerializableEnum::STR));
7066
}
@@ -76,7 +72,7 @@ public function testUnserializeThrowsLogicExceptionOnChangingValue()
7672
private function clearEnumeration($enumeration)
7773
{
7874
$reflClass = new ReflectionClass($enumeration);
79-
while ($reflClass->getName() !== 'MabeEnum\Enum') {
75+
while ($reflClass->getName() !== Enum::class) {
8076
$reflClass = $reflClass->getParentClass();
8177
}
8278

0 commit comments

Comments
 (0)