From d1bcdf30b78afc1efdd5a4a52f877f09722d68e4 Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Thu, 17 Dec 2020 15:26:38 -0600
Subject: [PATCH 1/5] Meaningful test names.

---
 Zend/tests/enum/{001.phpt => 001-comparison.phpt}               | 0
 Zend/tests/enum/{002.phpt => 002-basic-methods.phpt}            | 0
 Zend/tests/enum/{003.phpt => 003-enum-params.phpt}              | 2 +-
 Zend/tests/enum/{004.phpt => 004-instanceof.phpt}               | 0
 Zend/tests/enum/{005.phpt => 005-implements.phpt}               | 0
 Zend/tests/enum/{007.phpt => 007-final.phpt}                    | 0
 Zend/tests/enum/{009.phpt => 009-no-properties.phpt}            | 0
 Zend/tests/enum/{011.phpt => 011-no-instantiate.phpt}           | 0
 Zend/tests/enum/{012.phpt => 012-no-dynamic-properties.phpt}    | 0
 Zend/tests/enum/{013.phpt => 013-constants.phpt}                | 2 +-
 Zend/tests/enum/{015.phpt => 015-reflectionclass.phpt}          | 0
 Zend/tests/enum/{016.phpt => 016-no-constructors.phpt}          | 0
 Zend/tests/enum/{018.phpt => 018-no-static-properties.phpt}     | 0
 Zend/tests/enum/{019.phpt => 019-serialize.phpt}                | 0
 Zend/tests/enum/{020.phpt => 020-enum-attributes.phpt}          | 0
 Zend/tests/enum/{021.phpt => 021-is_enum.phpt}                  | 0
 Zend/tests/enum/{022.phpt => 022-default-parameter.phpt}        | 0
 Zend/tests/enum/{023.phpt => 023-enum-in-constant.phpt}         | 0
 Zend/tests/enum/{024.phpt => 024-var_export.phpt}               | 0
 Zend/tests/enum/{025.phpt => 025-unserialize.phpt}              | 0
 Zend/tests/enum/{026.phpt => 026-serialization-round-trip.phpt} | 0
 Zend/tests/enum/{027.phpt => 027-scalar-int.phpt}               | 0
 Zend/tests/enum/{028.phpt => 028-scalar-string.phpt}            | 0
 Zend/tests/enum/{029.phpt => 029-scalar-invalid.phpt}           | 0
 Zend/tests/enum/{030.phpt => 030-scalar-mismatch.phpt}          | 0
 Zend/tests/enum/{031.phpt => 031-instanceof-scalarenum.phpt}    | 0
 Zend/tests/enum/{032.phpt => 032-instanceof-unitenum.phpt}      | 0
 Zend/tests/enum/{033.phpt => 033-__get.phpt}                    | 0
 Zend/tests/enum/{034.phpt => 034-__call.phpt}                   | 0
 Zend/tests/enum/{035.phpt => 035-__invoke.phpt}                 | 0
 30 files changed, 2 insertions(+), 2 deletions(-)
 rename Zend/tests/enum/{001.phpt => 001-comparison.phpt} (100%)
 rename Zend/tests/enum/{002.phpt => 002-basic-methods.phpt} (100%)
 rename Zend/tests/enum/{003.phpt => 003-enum-params.phpt} (95%)
 rename Zend/tests/enum/{004.phpt => 004-instanceof.phpt} (100%)
 rename Zend/tests/enum/{005.phpt => 005-implements.phpt} (100%)
 rename Zend/tests/enum/{007.phpt => 007-final.phpt} (100%)
 rename Zend/tests/enum/{009.phpt => 009-no-properties.phpt} (100%)
 rename Zend/tests/enum/{011.phpt => 011-no-instantiate.phpt} (100%)
 rename Zend/tests/enum/{012.phpt => 012-no-dynamic-properties.phpt} (100%)
 rename Zend/tests/enum/{013.phpt => 013-constants.phpt} (84%)
 rename Zend/tests/enum/{015.phpt => 015-reflectionclass.phpt} (100%)
 rename Zend/tests/enum/{016.phpt => 016-no-constructors.phpt} (100%)
 rename Zend/tests/enum/{018.phpt => 018-no-static-properties.phpt} (100%)
 rename Zend/tests/enum/{019.phpt => 019-serialize.phpt} (100%)
 rename Zend/tests/enum/{020.phpt => 020-enum-attributes.phpt} (100%)
 rename Zend/tests/enum/{021.phpt => 021-is_enum.phpt} (100%)
 rename Zend/tests/enum/{022.phpt => 022-default-parameter.phpt} (100%)
 rename Zend/tests/enum/{023.phpt => 023-enum-in-constant.phpt} (100%)
 rename Zend/tests/enum/{024.phpt => 024-var_export.phpt} (100%)
 rename Zend/tests/enum/{025.phpt => 025-unserialize.phpt} (100%)
 rename Zend/tests/enum/{026.phpt => 026-serialization-round-trip.phpt} (100%)
 rename Zend/tests/enum/{027.phpt => 027-scalar-int.phpt} (100%)
 rename Zend/tests/enum/{028.phpt => 028-scalar-string.phpt} (100%)
 rename Zend/tests/enum/{029.phpt => 029-scalar-invalid.phpt} (100%)
 rename Zend/tests/enum/{030.phpt => 030-scalar-mismatch.phpt} (100%)
 rename Zend/tests/enum/{031.phpt => 031-instanceof-scalarenum.phpt} (100%)
 rename Zend/tests/enum/{032.phpt => 032-instanceof-unitenum.phpt} (100%)
 rename Zend/tests/enum/{033.phpt => 033-__get.phpt} (100%)
 rename Zend/tests/enum/{034.phpt => 034-__call.phpt} (100%)
 rename Zend/tests/enum/{035.phpt => 035-__invoke.phpt} (100%)

diff --git a/Zend/tests/enum/001.phpt b/Zend/tests/enum/001-comparison.phpt
similarity index 100%
rename from Zend/tests/enum/001.phpt
rename to Zend/tests/enum/001-comparison.phpt
diff --git a/Zend/tests/enum/002.phpt b/Zend/tests/enum/002-basic-methods.phpt
similarity index 100%
rename from Zend/tests/enum/002.phpt
rename to Zend/tests/enum/002-basic-methods.phpt
diff --git a/Zend/tests/enum/003.phpt b/Zend/tests/enum/003-enum-params.phpt
similarity index 95%
rename from Zend/tests/enum/003.phpt
rename to Zend/tests/enum/003-enum-params.phpt
index 81f511f62faa6..90a1f0b5d07f6 100644
--- a/Zend/tests/enum/003.phpt
+++ b/Zend/tests/enum/003-enum-params.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Enum type hints
+Enum types as parameters
 --FILE--
 <?php
 
diff --git a/Zend/tests/enum/004.phpt b/Zend/tests/enum/004-instanceof.phpt
similarity index 100%
rename from Zend/tests/enum/004.phpt
rename to Zend/tests/enum/004-instanceof.phpt
diff --git a/Zend/tests/enum/005.phpt b/Zend/tests/enum/005-implements.phpt
similarity index 100%
rename from Zend/tests/enum/005.phpt
rename to Zend/tests/enum/005-implements.phpt
diff --git a/Zend/tests/enum/007.phpt b/Zend/tests/enum/007-final.phpt
similarity index 100%
rename from Zend/tests/enum/007.phpt
rename to Zend/tests/enum/007-final.phpt
diff --git a/Zend/tests/enum/009.phpt b/Zend/tests/enum/009-no-properties.phpt
similarity index 100%
rename from Zend/tests/enum/009.phpt
rename to Zend/tests/enum/009-no-properties.phpt
diff --git a/Zend/tests/enum/011.phpt b/Zend/tests/enum/011-no-instantiate.phpt
similarity index 100%
rename from Zend/tests/enum/011.phpt
rename to Zend/tests/enum/011-no-instantiate.phpt
diff --git a/Zend/tests/enum/012.phpt b/Zend/tests/enum/012-no-dynamic-properties.phpt
similarity index 100%
rename from Zend/tests/enum/012.phpt
rename to Zend/tests/enum/012-no-dynamic-properties.phpt
diff --git a/Zend/tests/enum/013.phpt b/Zend/tests/enum/013-constants.phpt
similarity index 84%
rename from Zend/tests/enum/013.phpt
rename to Zend/tests/enum/013-constants.phpt
index bf0178f54f2c6..18dc62d205e8c 100644
--- a/Zend/tests/enum/013.phpt
+++ b/Zend/tests/enum/013-constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Enum disallows constants
+Enum allow constants
 --FILE--
 <?php
 
diff --git a/Zend/tests/enum/015.phpt b/Zend/tests/enum/015-reflectionclass.phpt
similarity index 100%
rename from Zend/tests/enum/015.phpt
rename to Zend/tests/enum/015-reflectionclass.phpt
diff --git a/Zend/tests/enum/016.phpt b/Zend/tests/enum/016-no-constructors.phpt
similarity index 100%
rename from Zend/tests/enum/016.phpt
rename to Zend/tests/enum/016-no-constructors.phpt
diff --git a/Zend/tests/enum/018.phpt b/Zend/tests/enum/018-no-static-properties.phpt
similarity index 100%
rename from Zend/tests/enum/018.phpt
rename to Zend/tests/enum/018-no-static-properties.phpt
diff --git a/Zend/tests/enum/019.phpt b/Zend/tests/enum/019-serialize.phpt
similarity index 100%
rename from Zend/tests/enum/019.phpt
rename to Zend/tests/enum/019-serialize.phpt
diff --git a/Zend/tests/enum/020.phpt b/Zend/tests/enum/020-enum-attributes.phpt
similarity index 100%
rename from Zend/tests/enum/020.phpt
rename to Zend/tests/enum/020-enum-attributes.phpt
diff --git a/Zend/tests/enum/021.phpt b/Zend/tests/enum/021-is_enum.phpt
similarity index 100%
rename from Zend/tests/enum/021.phpt
rename to Zend/tests/enum/021-is_enum.phpt
diff --git a/Zend/tests/enum/022.phpt b/Zend/tests/enum/022-default-parameter.phpt
similarity index 100%
rename from Zend/tests/enum/022.phpt
rename to Zend/tests/enum/022-default-parameter.phpt
diff --git a/Zend/tests/enum/023.phpt b/Zend/tests/enum/023-enum-in-constant.phpt
similarity index 100%
rename from Zend/tests/enum/023.phpt
rename to Zend/tests/enum/023-enum-in-constant.phpt
diff --git a/Zend/tests/enum/024.phpt b/Zend/tests/enum/024-var_export.phpt
similarity index 100%
rename from Zend/tests/enum/024.phpt
rename to Zend/tests/enum/024-var_export.phpt
diff --git a/Zend/tests/enum/025.phpt b/Zend/tests/enum/025-unserialize.phpt
similarity index 100%
rename from Zend/tests/enum/025.phpt
rename to Zend/tests/enum/025-unserialize.phpt
diff --git a/Zend/tests/enum/026.phpt b/Zend/tests/enum/026-serialization-round-trip.phpt
similarity index 100%
rename from Zend/tests/enum/026.phpt
rename to Zend/tests/enum/026-serialization-round-trip.phpt
diff --git a/Zend/tests/enum/027.phpt b/Zend/tests/enum/027-scalar-int.phpt
similarity index 100%
rename from Zend/tests/enum/027.phpt
rename to Zend/tests/enum/027-scalar-int.phpt
diff --git a/Zend/tests/enum/028.phpt b/Zend/tests/enum/028-scalar-string.phpt
similarity index 100%
rename from Zend/tests/enum/028.phpt
rename to Zend/tests/enum/028-scalar-string.phpt
diff --git a/Zend/tests/enum/029.phpt b/Zend/tests/enum/029-scalar-invalid.phpt
similarity index 100%
rename from Zend/tests/enum/029.phpt
rename to Zend/tests/enum/029-scalar-invalid.phpt
diff --git a/Zend/tests/enum/030.phpt b/Zend/tests/enum/030-scalar-mismatch.phpt
similarity index 100%
rename from Zend/tests/enum/030.phpt
rename to Zend/tests/enum/030-scalar-mismatch.phpt
diff --git a/Zend/tests/enum/031.phpt b/Zend/tests/enum/031-instanceof-scalarenum.phpt
similarity index 100%
rename from Zend/tests/enum/031.phpt
rename to Zend/tests/enum/031-instanceof-scalarenum.phpt
diff --git a/Zend/tests/enum/032.phpt b/Zend/tests/enum/032-instanceof-unitenum.phpt
similarity index 100%
rename from Zend/tests/enum/032.phpt
rename to Zend/tests/enum/032-instanceof-unitenum.phpt
diff --git a/Zend/tests/enum/033.phpt b/Zend/tests/enum/033-__get.phpt
similarity index 100%
rename from Zend/tests/enum/033.phpt
rename to Zend/tests/enum/033-__get.phpt
diff --git a/Zend/tests/enum/034.phpt b/Zend/tests/enum/034-__call.phpt
similarity index 100%
rename from Zend/tests/enum/034.phpt
rename to Zend/tests/enum/034-__call.phpt
diff --git a/Zend/tests/enum/035.phpt b/Zend/tests/enum/035-__invoke.phpt
similarity index 100%
rename from Zend/tests/enum/035.phpt
rename to Zend/tests/enum/035-__invoke.phpt

From 803160b6c01ada1d1d2b1ac3d21f1f2ef8d8fb77 Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Thu, 17 Dec 2020 16:40:45 -0600
Subject: [PATCH 2/5] Correct existing tests.

---
 Zend/tests/enum/013-constants.phpt |  6 ++++--
 Zend/tests/enum/021-is_enum.phpt   | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Zend/tests/enum/013-constants.phpt b/Zend/tests/enum/013-constants.phpt
index 18dc62d205e8c..a84d37d5e33c6 100644
--- a/Zend/tests/enum/013-constants.phpt
+++ b/Zend/tests/enum/013-constants.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Enum allow constants
+Enum allows constants
 --FILE--
 <?php
 
@@ -7,6 +7,8 @@ enum Foo {
     const BAR = 'Bar';
 }
 
+print Foo::BAR;
+
 ?>
 --EXPECTF--
-Fatal error: Enums cannot have constants in %s on line %d
+Bar
diff --git a/Zend/tests/enum/021-is_enum.phpt b/Zend/tests/enum/021-is_enum.phpt
index 65ff78e6d30b6..e7b3636a323d1 100644
--- a/Zend/tests/enum/021-is_enum.phpt
+++ b/Zend/tests/enum/021-is_enum.phpt
@@ -9,12 +9,22 @@ enum Foo {
 
 class Baz {}
 
+$enum_var = Foo::Bar;
+$not_enum_var = 'narf';
+
 var_dump(is_enum(Foo::class));
 var_dump(is_enum(Foo::Bar::class));
 var_dump(is_enum(Baz::class));
 
+var_dump(is_enum('beep'));
+var_dump(is_enum($enum_var));
+var_dump(is_enum($not_enum_var));
+
 ?>
 --EXPECT--
 bool(true)
 bool(true)
 bool(false)
+bool(false)
+bool(true)
+bool(false)

From 7dd9958cf25ec1eeacdd7398fd94ddcb695e74d7 Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Thu, 17 Dec 2020 16:40:58 -0600
Subject: [PATCH 3/5] Add more tests.

---
 Zend/tests/enum/036-constant-aliases.phpt     | 22 ++++++++++++
 Zend/tests/enum/037-enum-as-constant.phpt     | 22 ++++++++++++
 Zend/tests/enum/038-static-methods.phpt       | 28 +++++++++++++++
 Zend/tests/enum/039-traits-no-properties.phpt | 26 ++++++++++++++
 Zend/tests/enum/039-traits.phpt               | 32 +++++++++++++++++
 Zend/tests/enum/040-scalar-from.phpt          | 36 +++++++++++++++++++
 Zend/tests/enum/041-scalar-from-invalid.phpt  | 17 +++++++++
 Zend/tests/enum/042-unit-cases.phpt           | 26 ++++++++++++++
 Zend/tests/enum/043-scalar-cases.phpt         | 26 ++++++++++++++
 9 files changed, 235 insertions(+)
 create mode 100644 Zend/tests/enum/036-constant-aliases.phpt
 create mode 100644 Zend/tests/enum/037-enum-as-constant.phpt
 create mode 100644 Zend/tests/enum/038-static-methods.phpt
 create mode 100644 Zend/tests/enum/039-traits-no-properties.phpt
 create mode 100644 Zend/tests/enum/039-traits.phpt
 create mode 100644 Zend/tests/enum/040-scalar-from.phpt
 create mode 100644 Zend/tests/enum/041-scalar-from-invalid.phpt
 create mode 100644 Zend/tests/enum/042-unit-cases.phpt
 create mode 100644 Zend/tests/enum/043-scalar-cases.phpt

diff --git a/Zend/tests/enum/036-constant-aliases.phpt b/Zend/tests/enum/036-constant-aliases.phpt
new file mode 100644
index 0000000000000..db9c40d76bfa4
--- /dev/null
+++ b/Zend/tests/enum/036-constant-aliases.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Enum constants can alias cases
+--FILE--
+<?php
+
+enum Foo {
+    case Bar;
+    const Other = self::Bar;
+    const Again = static::Bar;
+}
+
+function test(Foo $var) {
+    print "works";
+}
+
+test(Foo:Other);
+test(Foo:Again);
+
+?>
+--EXPECTF--
+works
+works
diff --git a/Zend/tests/enum/037-enum-as-constant.phpt b/Zend/tests/enum/037-enum-as-constant.phpt
new file mode 100644
index 0000000000000..280f2b3926213
--- /dev/null
+++ b/Zend/tests/enum/037-enum-as-constant.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Enum cases can be referenced by constants
+--FILE--
+<?php
+
+enum Foo {
+    case Bar;
+}
+
+const Beep = Foo::Bar;
+
+class Test {
+    const Beep = Foo::Bar;
+}
+
+var_dump(Beep);
+var_dump(Test::Beep);
+
+?>
+--EXPECTF--
+enum(Foo::Bar)
+enum(Foo::Bar)
diff --git a/Zend/tests/enum/038-static-methods.phpt b/Zend/tests/enum/038-static-methods.phpt
new file mode 100644
index 0000000000000..bdf974e83a2e7
--- /dev/null
+++ b/Zend/tests/enum/038-static-methods.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Enum supports static methods
+--FILE--
+<?php
+
+enum Size {
+  case Small;
+  case Medium;
+  case Large;
+
+  public static function fromLength(int $cm) {
+    return match(true) {
+      $cm < 50 => static::Small,
+      $cm < 100 => static::Medium,
+      default => static::Large,
+    };
+  }
+}
+
+var_dump(Size::fromLength(23));
+var_dump(Size::fromLength(63));
+var_dump(Size::fromLength(123));
+
+?>
+--EXPECTF--
+enum(Size::Small)
+enum(Size::Medium)
+enum(Size::Large)
diff --git a/Zend/tests/enum/039-traits-no-properties.phpt b/Zend/tests/enum/039-traits-no-properties.phpt
new file mode 100644
index 0000000000000..90f49f493f7c3
--- /dev/null
+++ b/Zend/tests/enum/039-traits-no-properties.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Enum cannot have properties, even via traits
+--FILE--
+<?php
+
+trait Rectangle {
+  protected string $shape = "Rectangle";
+
+  public function shape(): string {
+    return $this->shape;
+  }
+}
+
+enum Suit {
+  use Rectangle;
+
+  case Hearts;
+  case Diamonds;
+  case Clubs;
+  case Spades;
+
+}
+
+?>
+--EXPECTF--
+Fatal error: Traits used in enumerations may not contain properties.
diff --git a/Zend/tests/enum/039-traits.phpt b/Zend/tests/enum/039-traits.phpt
new file mode 100644
index 0000000000000..43394bea8b381
--- /dev/null
+++ b/Zend/tests/enum/039-traits.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Enum can use traits
+--FILE--
+<?php
+
+trait Rectangle {
+  public function shape(): string {
+    return "Rectangle";
+  }
+}
+
+enum Suit {
+  use Rectangle;
+
+  case Hearts;
+  case Diamonds;
+  case Clubs;
+  case Spades;
+
+}
+
+print Suit::Hearts->shape() . PHP_EOL;
+print Suit::Diamonds->shape() . PHP_EOL;
+print Suit::Clubs->shape() . PHP_EOL;
+print Suit::Spades->shape() . PHP_EOL;
+
+?>
+--EXPECTF--
+Rectangle
+Rectangle
+Rectangle
+Rectangle
diff --git a/Zend/tests/enum/040-scalar-from.phpt b/Zend/tests/enum/040-scalar-from.phpt
new file mode 100644
index 0000000000000..807181837ff2e
--- /dev/null
+++ b/Zend/tests/enum/040-scalar-from.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Scalar enums can be upcast from a scalar
+--FILE--
+<?php
+
+enum Suit: string {
+  case Hearts = 'H';
+  case Diamonds = 'D';
+  case Clubs = 'C';
+  case Spades = 'S';
+}
+
+var_dump(Suit::from('H'));
+var_dump(Suit::from('D'));
+var_dump(Suit::from('C'));
+var_dump(Suit::from('S'));
+
+enum Foo: int {
+    case Bar = 1;
+    case Baz = 2;
+    case Beep = 3;
+}
+
+var_dump(Foo::from(1));
+var_dump(Foo::from(2));
+var_dump(Foo::from(3));
+
+?>
+--EXPECTF--
+enum(Suit::Hearts)
+enum(Suit::Diamonds)
+enum(Suit::Clubs)
+enum(Suit::Spades)
+enum(Foo::Bar)
+enum(Foo::Baz)
+enum(Foo::Beep)
diff --git a/Zend/tests/enum/041-scalar-from-invalid.phpt b/Zend/tests/enum/041-scalar-from-invalid.phpt
new file mode 100644
index 0000000000000..3d1a14f362555
--- /dev/null
+++ b/Zend/tests/enum/041-scalar-from-invalid.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Scalar enums reject upcasting from invalid input
+--FILE--
+<?php
+
+enum Suit: string {
+  case Hearts = 'H';
+  case Diamonds = 'D';
+  case Clubs = 'C';
+  case Spades = 'S';
+}
+
+var_dump(Suit::from('A'));
+
+?>
+--EXPECTF--
+Fatal Error: 'A' is not a valid scalar value for 'Suit' enumeration in %s on line %d
diff --git a/Zend/tests/enum/042-unit-cases.phpt b/Zend/tests/enum/042-unit-cases.phpt
new file mode 100644
index 0000000000000..e5824e83eff31
--- /dev/null
+++ b/Zend/tests/enum/042-unit-cases.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Unit enums can list cases
+--FILE--
+<?php
+
+enum Suit {
+  case Hearts;
+  case Diamonds;
+  case Clubs;
+  case Spades;
+}
+
+var_dump(Suit::cases());
+
+?>
+--EXPECTF--
+array(4) {
+  [0]=>
+  enum(Suit::Hearts)
+  [1]=>
+  enum(Suit::Diamonds)
+  [2]=>
+  enum(Suit::Clubs)
+  [3]=>
+  enum(Suit::Spades)
+}
diff --git a/Zend/tests/enum/043-scalar-cases.phpt b/Zend/tests/enum/043-scalar-cases.phpt
new file mode 100644
index 0000000000000..4e72d6b27d4d0
--- /dev/null
+++ b/Zend/tests/enum/043-scalar-cases.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Scalar enums can list cases
+--FILE--
+<?php
+
+enum Suit: string {
+  case Hearts = 'H';
+  case Diamonds = 'D';
+  case Clubs = 'C';
+  case Spades = 'S';
+}
+
+var_dump(Suit::cases());
+
+?>
+--EXPECTF--
+array(4) {
+  ["H"]=>
+  enum(Suit::Hearts)
+  ["D"]=>
+  enum(Suit::Diamonds)
+  ["C"]=>
+  enum(Suit::Clubs)
+  ["S"]=>
+  enum(Suit::Spades)
+}

From 0e8faf6b908dee8a936f6ab26ee49df590433d15 Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Thu, 17 Dec 2020 17:20:39 -0600
Subject: [PATCH 4/5] Fix formatting and skip not-yet-working tests.

---
 Zend/tests/enum/013-constants.phpt            |  4 ++++
 Zend/tests/enum/021-is_enum.phpt              |  6 +++++
 Zend/tests/enum/036-constant-aliases.phpt     |  4 ++++
 Zend/tests/enum/038-static-methods.phpt       | 20 ++++++++--------
 Zend/tests/enum/039-traits-no-properties.phpt | 23 +++++++++++--------
 Zend/tests/enum/039-traits.phpt               | 17 +++++++-------
 Zend/tests/enum/040-scalar-from.phpt          | 12 ++++++----
 Zend/tests/enum/041-scalar-from-invalid.phpt  | 12 ++++++----
 Zend/tests/enum/042-unit-cases.phpt           | 12 ++++++----
 Zend/tests/enum/043-scalar-cases.phpt         | 12 ++++++----
 10 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/Zend/tests/enum/013-constants.phpt b/Zend/tests/enum/013-constants.phpt
index a84d37d5e33c6..f9da4fb1869cf 100644
--- a/Zend/tests/enum/013-constants.phpt
+++ b/Zend/tests/enum/013-constants.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Enum allows constants
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/enum/021-is_enum.phpt b/Zend/tests/enum/021-is_enum.phpt
index e7b3636a323d1..d3b2a2da9285b 100644
--- a/Zend/tests/enum/021-is_enum.phpt
+++ b/Zend/tests/enum/021-is_enum.phpt
@@ -1,5 +1,9 @@
 --TEST--
 is_enum
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
@@ -12,7 +16,9 @@ class Baz {}
 $enum_var = Foo::Bar;
 $not_enum_var = 'narf';
 
+// I'm not sure this one is correct?
 var_dump(is_enum(Foo::class));
+
 var_dump(is_enum(Foo::Bar::class));
 var_dump(is_enum(Baz::class));
 
diff --git a/Zend/tests/enum/036-constant-aliases.phpt b/Zend/tests/enum/036-constant-aliases.phpt
index db9c40d76bfa4..9a08d37a677ab 100644
--- a/Zend/tests/enum/036-constant-aliases.phpt
+++ b/Zend/tests/enum/036-constant-aliases.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Enum constants can alias cases
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
diff --git a/Zend/tests/enum/038-static-methods.phpt b/Zend/tests/enum/038-static-methods.phpt
index bdf974e83a2e7..60a950b9291f2 100644
--- a/Zend/tests/enum/038-static-methods.phpt
+++ b/Zend/tests/enum/038-static-methods.phpt
@@ -4,17 +4,17 @@ Enum supports static methods
 <?php
 
 enum Size {
-  case Small;
-  case Medium;
-  case Large;
+    case Small;
+    case Medium;
+    case Large;
 
-  public static function fromLength(int $cm) {
-    return match(true) {
-      $cm < 50 => static::Small,
-      $cm < 100 => static::Medium,
-      default => static::Large,
-    };
-  }
+    public static function fromLength(int $cm) {
+        return match(true) {
+            $cm < 50 => static::Small,
+            $cm < 100 => static::Medium,
+            default => static::Large,
+        };
+    }
 }
 
 var_dump(Size::fromLength(23));
diff --git a/Zend/tests/enum/039-traits-no-properties.phpt b/Zend/tests/enum/039-traits-no-properties.phpt
index 90f49f493f7c3..9762f5873bebe 100644
--- a/Zend/tests/enum/039-traits-no-properties.phpt
+++ b/Zend/tests/enum/039-traits-no-properties.phpt
@@ -1,24 +1,27 @@
 --TEST--
 Enum cannot have properties, even via traits
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
 trait Rectangle {
-  protected string $shape = "Rectangle";
+    protected string $shape = "Rectangle";
 
-  public function shape(): string {
-    return $this->shape;
-  }
+    public function shape(): string {
+        return $this->shape;
+    }
 }
 
 enum Suit {
-  use Rectangle;
-
-  case Hearts;
-  case Diamonds;
-  case Clubs;
-  case Spades;
+    use Rectangle;
 
+    case Hearts;
+    case Diamonds;
+    case Clubs;
+    case Spades;
 }
 
 ?>
diff --git a/Zend/tests/enum/039-traits.phpt b/Zend/tests/enum/039-traits.phpt
index 43394bea8b381..33f4e882294df 100644
--- a/Zend/tests/enum/039-traits.phpt
+++ b/Zend/tests/enum/039-traits.phpt
@@ -4,19 +4,18 @@ Enum can use traits
 <?php
 
 trait Rectangle {
-  public function shape(): string {
-    return "Rectangle";
-  }
+    public function shape(): string {
+        return "Rectangle";
+    }
 }
 
 enum Suit {
-  use Rectangle;
-
-  case Hearts;
-  case Diamonds;
-  case Clubs;
-  case Spades;
+    use Rectangle;
 
+    case Hearts;
+    case Diamonds;
+    case Clubs;
+    case Spades;
 }
 
 print Suit::Hearts->shape() . PHP_EOL;
diff --git a/Zend/tests/enum/040-scalar-from.phpt b/Zend/tests/enum/040-scalar-from.phpt
index 807181837ff2e..7c36fdb6e2290 100644
--- a/Zend/tests/enum/040-scalar-from.phpt
+++ b/Zend/tests/enum/040-scalar-from.phpt
@@ -1,13 +1,17 @@
 --TEST--
 Scalar enums can be upcast from a scalar
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
 enum Suit: string {
-  case Hearts = 'H';
-  case Diamonds = 'D';
-  case Clubs = 'C';
-  case Spades = 'S';
+    case Hearts = 'H';
+    case Diamonds = 'D';
+    case Clubs = 'C';
+    case Spades = 'S';
 }
 
 var_dump(Suit::from('H'));
diff --git a/Zend/tests/enum/041-scalar-from-invalid.phpt b/Zend/tests/enum/041-scalar-from-invalid.phpt
index 3d1a14f362555..4238663b7e147 100644
--- a/Zend/tests/enum/041-scalar-from-invalid.phpt
+++ b/Zend/tests/enum/041-scalar-from-invalid.phpt
@@ -1,13 +1,17 @@
 --TEST--
 Scalar enums reject upcasting from invalid input
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
 enum Suit: string {
-  case Hearts = 'H';
-  case Diamonds = 'D';
-  case Clubs = 'C';
-  case Spades = 'S';
+    case Hearts = 'H';
+    case Diamonds = 'D';
+    case Clubs = 'C';
+    case Spades = 'S';
 }
 
 var_dump(Suit::from('A'));
diff --git a/Zend/tests/enum/042-unit-cases.phpt b/Zend/tests/enum/042-unit-cases.phpt
index e5824e83eff31..d7666780858fc 100644
--- a/Zend/tests/enum/042-unit-cases.phpt
+++ b/Zend/tests/enum/042-unit-cases.phpt
@@ -1,13 +1,17 @@
 --TEST--
 Unit enums can list cases
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
 enum Suit {
-  case Hearts;
-  case Diamonds;
-  case Clubs;
-  case Spades;
+    case Hearts;
+    case Diamonds;
+    case Clubs;
+    case Spades;
 }
 
 var_dump(Suit::cases());
diff --git a/Zend/tests/enum/043-scalar-cases.phpt b/Zend/tests/enum/043-scalar-cases.phpt
index 4e72d6b27d4d0..e80f31c6a358e 100644
--- a/Zend/tests/enum/043-scalar-cases.phpt
+++ b/Zend/tests/enum/043-scalar-cases.phpt
@@ -1,13 +1,17 @@
 --TEST--
 Scalar enums can list cases
+--SKIPIF--
+<?php
+die("skip, not yet implemented");
+?>
 --FILE--
 <?php
 
 enum Suit: string {
-  case Hearts = 'H';
-  case Diamonds = 'D';
-  case Clubs = 'C';
-  case Spades = 'S';
+    case Hearts = 'H';
+    case Diamonds = 'D';
+    case Clubs = 'C';
+    case Spades = 'S';
 }
 
 var_dump(Suit::cases());

From 6685b347cdea1be893f392150910566345b42428 Mon Sep 17 00:00:00 2001
From: Larry Garfield <larry@garfieldtech.com>
Date: Thu, 17 Dec 2020 17:24:51 -0600
Subject: [PATCH 5/5] Rename test files to remove serials.

---
 Zend/tests/enum/{034-__call.phpt => __call.phpt}                  | 0
 Zend/tests/enum/{033-__get.phpt => __get.phpt}                    | 0
 Zend/tests/enum/{035-__invoke.phpt => __invoke.phpt}              | 0
 Zend/tests/enum/{002-basic-methods.phpt => basic-methods.phpt}    | 0
 Zend/tests/enum/{001-comparison.phpt => comparison.phpt}          | 0
 .../enum/{036-constant-aliases.phpt => constant-aliases.phpt}     | 0
 Zend/tests/enum/{013-constants.phpt => constants.phpt}            | 0
 .../enum/{022-default-parameter.phpt => default-parameter.phpt}   | 0
 .../enum/{037-enum-as-constant.phpt => enum-as-constant.phpt}     | 0
 Zend/tests/enum/{003-enum-params.phpt => enum-as-params.phpt}     | 0
 .../tests/enum/{020-enum-attributes.phpt => enum-attributes.phpt} | 0
 .../enum/{023-enum-in-constant.phpt => enum-in-constant.phpt}     | 0
 Zend/tests/enum/{007-final.phpt => final.phpt}                    | 0
 Zend/tests/enum/{005-implements.phpt => implements.phpt}          | 0
 ...{031-instanceof-scalarenum.phpt => instanceof-scalarenum.phpt} | 0
 .../{032-instanceof-unitenum.phpt => instanceof-unitenum.phpt}    | 0
 Zend/tests/enum/{004-instanceof.phpt => instanceof.phpt}          | 0
 Zend/tests/enum/{021-is_enum.phpt => is_enum.phpt}                | 0
 .../tests/enum/{016-no-constructors.phpt => no-constructors.phpt} | 0
 ...{012-no-dynamic-properties.phpt => no-dynamic-properties.phpt} | 0
 Zend/tests/enum/{011-no-instantiate.phpt => no-instantiate.phpt}  | 0
 Zend/tests/enum/{009-no-properties.phpt => no-properties.phpt}    | 0
 .../{018-no-static-properties.phpt => no-static-properties.phpt}  | 0
 .../tests/enum/{015-reflectionclass.phpt => reflectionclass.phpt} | 0
 Zend/tests/enum/{043-scalar-cases.phpt => scalar-cases.phpt}      | 0
 .../{041-scalar-from-invalid.phpt => scalar-from-invalid.phpt}    | 0
 Zend/tests/enum/{040-scalar-from.phpt => scalar-from.phpt}        | 0
 Zend/tests/enum/{027-scalar-int.phpt => scalar-int.phpt}          | 0
 Zend/tests/enum/{029-scalar-invalid.phpt => scalar-invalid.phpt}  | 0
 .../tests/enum/{030-scalar-mismatch.phpt => scalar-mismatch.phpt} | 0
 Zend/tests/enum/{028-scalar-string.phpt => scalar-string.phpt}    | 0
 ...erialization-round-trip.phpt => serialization-round-trip.phpt} | 0
 Zend/tests/enum/{019-serialize.phpt => serialize.phpt}            | 0
 Zend/tests/enum/{038-static-methods.phpt => static-methods.phpt}  | 0
 .../{039-traits-no-properties.phpt => traits-no-properties.phpt}  | 0
 Zend/tests/enum/{039-traits.phpt => traits.phpt}                  | 0
 Zend/tests/enum/{042-unit-cases.phpt => unit-cases.phpt}          | 0
 Zend/tests/enum/{025-unserialize.phpt => unserialize.phpt}        | 0
 Zend/tests/enum/{024-var_export.phpt => var_export.phpt}          | 0
 39 files changed, 0 insertions(+), 0 deletions(-)
 rename Zend/tests/enum/{034-__call.phpt => __call.phpt} (100%)
 rename Zend/tests/enum/{033-__get.phpt => __get.phpt} (100%)
 rename Zend/tests/enum/{035-__invoke.phpt => __invoke.phpt} (100%)
 rename Zend/tests/enum/{002-basic-methods.phpt => basic-methods.phpt} (100%)
 rename Zend/tests/enum/{001-comparison.phpt => comparison.phpt} (100%)
 rename Zend/tests/enum/{036-constant-aliases.phpt => constant-aliases.phpt} (100%)
 rename Zend/tests/enum/{013-constants.phpt => constants.phpt} (100%)
 rename Zend/tests/enum/{022-default-parameter.phpt => default-parameter.phpt} (100%)
 rename Zend/tests/enum/{037-enum-as-constant.phpt => enum-as-constant.phpt} (100%)
 rename Zend/tests/enum/{003-enum-params.phpt => enum-as-params.phpt} (100%)
 rename Zend/tests/enum/{020-enum-attributes.phpt => enum-attributes.phpt} (100%)
 rename Zend/tests/enum/{023-enum-in-constant.phpt => enum-in-constant.phpt} (100%)
 rename Zend/tests/enum/{007-final.phpt => final.phpt} (100%)
 rename Zend/tests/enum/{005-implements.phpt => implements.phpt} (100%)
 rename Zend/tests/enum/{031-instanceof-scalarenum.phpt => instanceof-scalarenum.phpt} (100%)
 rename Zend/tests/enum/{032-instanceof-unitenum.phpt => instanceof-unitenum.phpt} (100%)
 rename Zend/tests/enum/{004-instanceof.phpt => instanceof.phpt} (100%)
 rename Zend/tests/enum/{021-is_enum.phpt => is_enum.phpt} (100%)
 rename Zend/tests/enum/{016-no-constructors.phpt => no-constructors.phpt} (100%)
 rename Zend/tests/enum/{012-no-dynamic-properties.phpt => no-dynamic-properties.phpt} (100%)
 rename Zend/tests/enum/{011-no-instantiate.phpt => no-instantiate.phpt} (100%)
 rename Zend/tests/enum/{009-no-properties.phpt => no-properties.phpt} (100%)
 rename Zend/tests/enum/{018-no-static-properties.phpt => no-static-properties.phpt} (100%)
 rename Zend/tests/enum/{015-reflectionclass.phpt => reflectionclass.phpt} (100%)
 rename Zend/tests/enum/{043-scalar-cases.phpt => scalar-cases.phpt} (100%)
 rename Zend/tests/enum/{041-scalar-from-invalid.phpt => scalar-from-invalid.phpt} (100%)
 rename Zend/tests/enum/{040-scalar-from.phpt => scalar-from.phpt} (100%)
 rename Zend/tests/enum/{027-scalar-int.phpt => scalar-int.phpt} (100%)
 rename Zend/tests/enum/{029-scalar-invalid.phpt => scalar-invalid.phpt} (100%)
 rename Zend/tests/enum/{030-scalar-mismatch.phpt => scalar-mismatch.phpt} (100%)
 rename Zend/tests/enum/{028-scalar-string.phpt => scalar-string.phpt} (100%)
 rename Zend/tests/enum/{026-serialization-round-trip.phpt => serialization-round-trip.phpt} (100%)
 rename Zend/tests/enum/{019-serialize.phpt => serialize.phpt} (100%)
 rename Zend/tests/enum/{038-static-methods.phpt => static-methods.phpt} (100%)
 rename Zend/tests/enum/{039-traits-no-properties.phpt => traits-no-properties.phpt} (100%)
 rename Zend/tests/enum/{039-traits.phpt => traits.phpt} (100%)
 rename Zend/tests/enum/{042-unit-cases.phpt => unit-cases.phpt} (100%)
 rename Zend/tests/enum/{025-unserialize.phpt => unserialize.phpt} (100%)
 rename Zend/tests/enum/{024-var_export.phpt => var_export.phpt} (100%)

diff --git a/Zend/tests/enum/034-__call.phpt b/Zend/tests/enum/__call.phpt
similarity index 100%
rename from Zend/tests/enum/034-__call.phpt
rename to Zend/tests/enum/__call.phpt
diff --git a/Zend/tests/enum/033-__get.phpt b/Zend/tests/enum/__get.phpt
similarity index 100%
rename from Zend/tests/enum/033-__get.phpt
rename to Zend/tests/enum/__get.phpt
diff --git a/Zend/tests/enum/035-__invoke.phpt b/Zend/tests/enum/__invoke.phpt
similarity index 100%
rename from Zend/tests/enum/035-__invoke.phpt
rename to Zend/tests/enum/__invoke.phpt
diff --git a/Zend/tests/enum/002-basic-methods.phpt b/Zend/tests/enum/basic-methods.phpt
similarity index 100%
rename from Zend/tests/enum/002-basic-methods.phpt
rename to Zend/tests/enum/basic-methods.phpt
diff --git a/Zend/tests/enum/001-comparison.phpt b/Zend/tests/enum/comparison.phpt
similarity index 100%
rename from Zend/tests/enum/001-comparison.phpt
rename to Zend/tests/enum/comparison.phpt
diff --git a/Zend/tests/enum/036-constant-aliases.phpt b/Zend/tests/enum/constant-aliases.phpt
similarity index 100%
rename from Zend/tests/enum/036-constant-aliases.phpt
rename to Zend/tests/enum/constant-aliases.phpt
diff --git a/Zend/tests/enum/013-constants.phpt b/Zend/tests/enum/constants.phpt
similarity index 100%
rename from Zend/tests/enum/013-constants.phpt
rename to Zend/tests/enum/constants.phpt
diff --git a/Zend/tests/enum/022-default-parameter.phpt b/Zend/tests/enum/default-parameter.phpt
similarity index 100%
rename from Zend/tests/enum/022-default-parameter.phpt
rename to Zend/tests/enum/default-parameter.phpt
diff --git a/Zend/tests/enum/037-enum-as-constant.phpt b/Zend/tests/enum/enum-as-constant.phpt
similarity index 100%
rename from Zend/tests/enum/037-enum-as-constant.phpt
rename to Zend/tests/enum/enum-as-constant.phpt
diff --git a/Zend/tests/enum/003-enum-params.phpt b/Zend/tests/enum/enum-as-params.phpt
similarity index 100%
rename from Zend/tests/enum/003-enum-params.phpt
rename to Zend/tests/enum/enum-as-params.phpt
diff --git a/Zend/tests/enum/020-enum-attributes.phpt b/Zend/tests/enum/enum-attributes.phpt
similarity index 100%
rename from Zend/tests/enum/020-enum-attributes.phpt
rename to Zend/tests/enum/enum-attributes.phpt
diff --git a/Zend/tests/enum/023-enum-in-constant.phpt b/Zend/tests/enum/enum-in-constant.phpt
similarity index 100%
rename from Zend/tests/enum/023-enum-in-constant.phpt
rename to Zend/tests/enum/enum-in-constant.phpt
diff --git a/Zend/tests/enum/007-final.phpt b/Zend/tests/enum/final.phpt
similarity index 100%
rename from Zend/tests/enum/007-final.phpt
rename to Zend/tests/enum/final.phpt
diff --git a/Zend/tests/enum/005-implements.phpt b/Zend/tests/enum/implements.phpt
similarity index 100%
rename from Zend/tests/enum/005-implements.phpt
rename to Zend/tests/enum/implements.phpt
diff --git a/Zend/tests/enum/031-instanceof-scalarenum.phpt b/Zend/tests/enum/instanceof-scalarenum.phpt
similarity index 100%
rename from Zend/tests/enum/031-instanceof-scalarenum.phpt
rename to Zend/tests/enum/instanceof-scalarenum.phpt
diff --git a/Zend/tests/enum/032-instanceof-unitenum.phpt b/Zend/tests/enum/instanceof-unitenum.phpt
similarity index 100%
rename from Zend/tests/enum/032-instanceof-unitenum.phpt
rename to Zend/tests/enum/instanceof-unitenum.phpt
diff --git a/Zend/tests/enum/004-instanceof.phpt b/Zend/tests/enum/instanceof.phpt
similarity index 100%
rename from Zend/tests/enum/004-instanceof.phpt
rename to Zend/tests/enum/instanceof.phpt
diff --git a/Zend/tests/enum/021-is_enum.phpt b/Zend/tests/enum/is_enum.phpt
similarity index 100%
rename from Zend/tests/enum/021-is_enum.phpt
rename to Zend/tests/enum/is_enum.phpt
diff --git a/Zend/tests/enum/016-no-constructors.phpt b/Zend/tests/enum/no-constructors.phpt
similarity index 100%
rename from Zend/tests/enum/016-no-constructors.phpt
rename to Zend/tests/enum/no-constructors.phpt
diff --git a/Zend/tests/enum/012-no-dynamic-properties.phpt b/Zend/tests/enum/no-dynamic-properties.phpt
similarity index 100%
rename from Zend/tests/enum/012-no-dynamic-properties.phpt
rename to Zend/tests/enum/no-dynamic-properties.phpt
diff --git a/Zend/tests/enum/011-no-instantiate.phpt b/Zend/tests/enum/no-instantiate.phpt
similarity index 100%
rename from Zend/tests/enum/011-no-instantiate.phpt
rename to Zend/tests/enum/no-instantiate.phpt
diff --git a/Zend/tests/enum/009-no-properties.phpt b/Zend/tests/enum/no-properties.phpt
similarity index 100%
rename from Zend/tests/enum/009-no-properties.phpt
rename to Zend/tests/enum/no-properties.phpt
diff --git a/Zend/tests/enum/018-no-static-properties.phpt b/Zend/tests/enum/no-static-properties.phpt
similarity index 100%
rename from Zend/tests/enum/018-no-static-properties.phpt
rename to Zend/tests/enum/no-static-properties.phpt
diff --git a/Zend/tests/enum/015-reflectionclass.phpt b/Zend/tests/enum/reflectionclass.phpt
similarity index 100%
rename from Zend/tests/enum/015-reflectionclass.phpt
rename to Zend/tests/enum/reflectionclass.phpt
diff --git a/Zend/tests/enum/043-scalar-cases.phpt b/Zend/tests/enum/scalar-cases.phpt
similarity index 100%
rename from Zend/tests/enum/043-scalar-cases.phpt
rename to Zend/tests/enum/scalar-cases.phpt
diff --git a/Zend/tests/enum/041-scalar-from-invalid.phpt b/Zend/tests/enum/scalar-from-invalid.phpt
similarity index 100%
rename from Zend/tests/enum/041-scalar-from-invalid.phpt
rename to Zend/tests/enum/scalar-from-invalid.phpt
diff --git a/Zend/tests/enum/040-scalar-from.phpt b/Zend/tests/enum/scalar-from.phpt
similarity index 100%
rename from Zend/tests/enum/040-scalar-from.phpt
rename to Zend/tests/enum/scalar-from.phpt
diff --git a/Zend/tests/enum/027-scalar-int.phpt b/Zend/tests/enum/scalar-int.phpt
similarity index 100%
rename from Zend/tests/enum/027-scalar-int.phpt
rename to Zend/tests/enum/scalar-int.phpt
diff --git a/Zend/tests/enum/029-scalar-invalid.phpt b/Zend/tests/enum/scalar-invalid.phpt
similarity index 100%
rename from Zend/tests/enum/029-scalar-invalid.phpt
rename to Zend/tests/enum/scalar-invalid.phpt
diff --git a/Zend/tests/enum/030-scalar-mismatch.phpt b/Zend/tests/enum/scalar-mismatch.phpt
similarity index 100%
rename from Zend/tests/enum/030-scalar-mismatch.phpt
rename to Zend/tests/enum/scalar-mismatch.phpt
diff --git a/Zend/tests/enum/028-scalar-string.phpt b/Zend/tests/enum/scalar-string.phpt
similarity index 100%
rename from Zend/tests/enum/028-scalar-string.phpt
rename to Zend/tests/enum/scalar-string.phpt
diff --git a/Zend/tests/enum/026-serialization-round-trip.phpt b/Zend/tests/enum/serialization-round-trip.phpt
similarity index 100%
rename from Zend/tests/enum/026-serialization-round-trip.phpt
rename to Zend/tests/enum/serialization-round-trip.phpt
diff --git a/Zend/tests/enum/019-serialize.phpt b/Zend/tests/enum/serialize.phpt
similarity index 100%
rename from Zend/tests/enum/019-serialize.phpt
rename to Zend/tests/enum/serialize.phpt
diff --git a/Zend/tests/enum/038-static-methods.phpt b/Zend/tests/enum/static-methods.phpt
similarity index 100%
rename from Zend/tests/enum/038-static-methods.phpt
rename to Zend/tests/enum/static-methods.phpt
diff --git a/Zend/tests/enum/039-traits-no-properties.phpt b/Zend/tests/enum/traits-no-properties.phpt
similarity index 100%
rename from Zend/tests/enum/039-traits-no-properties.phpt
rename to Zend/tests/enum/traits-no-properties.phpt
diff --git a/Zend/tests/enum/039-traits.phpt b/Zend/tests/enum/traits.phpt
similarity index 100%
rename from Zend/tests/enum/039-traits.phpt
rename to Zend/tests/enum/traits.phpt
diff --git a/Zend/tests/enum/042-unit-cases.phpt b/Zend/tests/enum/unit-cases.phpt
similarity index 100%
rename from Zend/tests/enum/042-unit-cases.phpt
rename to Zend/tests/enum/unit-cases.phpt
diff --git a/Zend/tests/enum/025-unserialize.phpt b/Zend/tests/enum/unserialize.phpt
similarity index 100%
rename from Zend/tests/enum/025-unserialize.phpt
rename to Zend/tests/enum/unserialize.phpt
diff --git a/Zend/tests/enum/024-var_export.phpt b/Zend/tests/enum/var_export.phpt
similarity index 100%
rename from Zend/tests/enum/024-var_export.phpt
rename to Zend/tests/enum/var_export.phpt