PHPunit 9

Author: marc-mabe

tests/MabeEnumTest/EnumSerializableTraitTest.php

@@ -21,7 +21,7 @@ class EnumSerializableTraitTest extends TestCase
     public function testSerializeSerializableEnum()
     {
         $serialized = serialize(SerializableEnum::get(SerializableEnum::NIL));
-        $this->assertInternalType('string', $serialized);
+        $this->assertSame('string', gettype($serialized));
 
         $unserialized = unserialize($serialized);
         $this->assertInstanceOf(SerializableEnum::class, $unserialized);
@@ -30,7 +30,7 @@ public function testSerializeSerializableEnum()
     public function testUnserializeFirstWillHoldTheSameInstance()
     {
         $serialized = serialize(SerializableEnum::get(SerializableEnum::STR));
-        $this->assertInternalType('string', $serialized);
+        $this->assertSame('string', gettype($serialized));
 
         // clear all instantiated instances so we can virtual test unserializing first
         $this->clearEnumeration(SerializableEnum::class);

tests/MabeEnumTest/EnumTest.php

@@ -26,16 +26,6 @@
  */
 class EnumTest extends TestCase
 {
-    public function setUp()
-    {
-        $this->resetStaticEnumProps();
-    }
-
-    public function tearDown()
-    {
-        assert_options(ASSERT_ACTIVE, 1);
-    }
-
     /**
      * Un-initialize all known enumerations
      */
@@ -325,10 +315,15 @@ public function testEnabledAssertAmbiguousEnumeratorValues()
 
     public function testDisabledAssertAmbiguousEnumeratorValues()
     {
-        assert_options(ASSERT_ACTIVE, 0);
         $this->expectException(InvalidArgumentException::class);
 
-        EnumAmbiguous::get('unknown');
+        try {
+            assert_options(ASSERT_ACTIVE, 0);
+            EnumAmbiguous::get('unknown');
+        } catch (\Exception $e) {
+            assert_options(ASSERT_ACTIVE, 1);
+            throw $e;
+        }
     }
 
     public function testExtendedEnabledAssertAmbiguousEnumeratorValues()
@@ -345,10 +340,15 @@ public function testExtendedEnabledAssertAmbiguousEnumeratorValues()
 
     public function testExtendedDisabledAssertAmbiguousEnumeratorValues()
     {
-        assert_options(ASSERT_ACTIVE, 0);
         $this->expectException(InvalidArgumentException::class);
 
-        EnumExtendedAmbiguous::get('unknown');
+        try {
+            assert_options(ASSERT_ACTIVE, 0);
+            EnumExtendedAmbiguous::get('unknown');
+        } catch (\Exception $e) {
+            assert_options(ASSERT_ACTIVE, 1);
+            throw $e;
+        }
     }
 
     public function testSingleton()