diff --git a/examples/enum1.php b/examples/enum1.php
new file mode 100644
index 00000000..b59e3119
--- /dev/null
+++ b/examples/enum1.php
@@ -0,0 +1,26 @@
+<?php
+interface Colorful {
+    public function color(): string;
+}
+
+enum Suit implements Colorful {
+    case Hearts;
+    case Diamonds;
+    case Clubs;
+    case Spades;
+
+    public function color(): string {
+        return match ($this) {
+            self::Hearts, self::Diamonds => 'Red',
+            self::Clubs, self::Spades => 'Black',
+        };
+    }
+}
+
+function main()
+{
+    echo Suit::Hearts->color() . "\n";
+    echo Suit::Diamonds->color() . "\n";
+    echo Suit::Clubs->color() . "\n";
+    echo Suit::Spades->color() . "\n";
+}
\ No newline at end of file
diff --git a/src/Php/CompilerBase.php b/src/Php/CompilerBase.php
index 46be2532..e56d632c 100644
--- a/src/Php/CompilerBase.php
+++ b/src/Php/CompilerBase.php
@@ -360,6 +360,8 @@ class CompilerBase extends \PhpAot\Core\Translator
                 return $this->parseBinaryOpPow($expr);
             case 'Expr_Ternary':
                 return $this->parseTernary($expr);
+            case 'Expr_Match':
+                return $this->parseMatch($expr);
             case 'Expr_FuncCall':
                 return $this->parseFuncCall($expr);
             case 'Expr_MethodCall':
@@ -2025,7 +2027,7 @@ class CompilerBase extends \PhpAot\Core\Translator
         return $this->parsePostOp($expr, '+');
     }
 
-    protected function parseTernary(mixed $expr): string
+    protected function parseTernary(Node\Expr\Ternary $expr): string
     {
         $cond = $expr->cond;
         $if   = $expr->if;
@@ -2038,6 +2040,11 @@ class CompilerBase extends \PhpAot\Core\Translator
         return '(' . $this->parseExpr($cond) . ') ? (' . $this->parseExpr($if) . ') : (' . $this->parseExpr($else) . ')';
     }
 
+    protected function parseMatch(Node\Expr\Match_ $expr): string
+    {
+        abort($expr);
+    }
+
     protected function parseBinaryOpGreater(mixed $expr): string
     {
         return $this->convertBoolExpr($this->parseBinaryOp($expr->left, $expr->right, '>'));
diff --git a/src/Php/Preprocessor.php b/src/Php/Preprocessor.php
index 7b777f60..d5f5d592 100644
--- a/src/Php/Preprocessor.php
+++ b/src/Php/Preprocessor.php
@@ -90,6 +90,7 @@ class Preprocessor extends CompilerBase
                 case 'Stmt_Namespace':
                     $this->prepareNamespaceDef($v);
                     break;
+                case 'Stmt_Enum':
                 case 'Stmt_Class':
                 case 'Stmt_Trait':
                     $this->prepareClass($v);
@@ -135,6 +136,7 @@ class Preprocessor extends CompilerBase
             $type2 = $v2->getType();
             switch ($type2) {
                 case 'Stmt_Class':
+                case 'Stmt_Enum':
                     $this->prepareClass($v2);
                     break;
                 case 'Stmt_Function':
@@ -162,7 +164,7 @@ class Preprocessor extends CompilerBase
         }
     }
 
-    protected function prepareClass(Node\Stmt\Class_|Node\Stmt\Trait_ $class): string
+    protected function prepareClass(Node\Stmt\Class_|Node\Stmt\Trait_|Node\Stmt\Enum_ $class): string
     {
         $this->class = $this->parseIdentifier($class->name);
         $code        = '';
@@ -173,6 +175,7 @@ class Preprocessor extends CompilerBase
                 case 'Stmt_Property':
                 case 'Stmt_Nop':
                 case 'Stmt_TraitUse':
+                case 'Stmt_EnumCase':
                     break;
                 case 'Stmt_ClassMethod':
                     $code .= $this->prepareFunction($v) . PHP_EOL;
diff --git a/src/Php/Translator.php b/src/Php/Translator.php
index e7f26630..c07afe59 100644
--- a/src/Php/Translator.php
+++ b/src/Php/Translator.php
@@ -479,6 +479,7 @@ class Translator extends Preprocessor
                     break;
                 case 'Stmt_Class':
                 case 'Stmt_Trait':
+                case 'Stmt_Enum':
                     $cppCode .= $this->parseClass($v);
                     break;
                 case 'Stmt_Use':
@@ -649,11 +650,18 @@ class Translator extends Preprocessor
         $this->argInfoHeaderFiles[] = $headerFile;
     }
 
-    protected function parseClass(Node\Stmt\Class_|Node\Stmt\Trait_ $class): string
+    protected function parseClass(Node\Stmt\Class_|Node\Stmt\Trait_|Node\Stmt\Enum_ $class): string
     {
-        $this->class    = $this->parseIdentifier($class->name);
-        $this->classDef = new ClassDef($this->class, $class->flags, $this->namespace);
-        if ($class->extends) {
+        $this->class = $this->parseIdentifier($class->name);
+        if ($class instanceof Node\Stmt\Enum_) {
+            $flags = Modifiers::PUBLIC;
+            $extends = '';
+        } else {
+            $flags = $class->flags;
+            $extends = $class->extends;
+        }
+        $this->classDef = new ClassDef($this->class, $flags, $this->namespace);
+        if ($extends) {
             $this->classDef->extends = $this->parseIdentifier($class->extends);
             if (isset($this->classes[$this->classDef->extends])) {
                 $parent = $this->classes[$this->classDef->extends];
@@ -682,6 +690,7 @@ class Translator extends Preprocessor
                 case 'Stmt_ClassMethod':
                     $this->parseClassMethod($v, $methodCodes);
                     break;
+                case 'Stmt_EnumCase':
                 case 'Stmt_Nop':
                     break;
                 default:
diff --git a/tests/zend/closures/closure_016.phpt b/tests/zend/closures/closure_016.phpt
new file mode 100644
index 00000000..5014ba70
--- /dev/null
+++ b/tests/zend/closures/closure_016.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Closure 016: closures and is_callable()
+--FILE--
+<?php
+class Foo {
+    function __invoke() {
+        echo "Hello World!\n";
+    }
+}
+
+function foo() {
+    return function() {
+        echo "Hello World!\n";
+    };
+}
+
+function main() {
+    $test = new Foo;
+    var_dump(is_callable($test, true, $name));
+    echo $name."\n";
+    var_dump(is_callable($test, false, $name));
+    echo $name."\n";
+    var_dump(is_callable(array($test,"__invoke"), true, $name));
+    echo $name."\n";
+    var_dump(is_callable(array($test,"__invoke"), false, $name));
+    echo $name."\n";
+    $test = foo();
+    var_dump(is_callable($test, true, $name));
+    echo $name."\n";
+    var_dump(is_callable($test, false, $name));
+    echo $name."\n";
+    var_dump(is_callable(array($test,"__invoke"), true, $name));
+    echo $name."\n";
+    var_dump(is_callable(array($test,"__invoke"), false, $name));
+    echo $name."\n";
+}
+?>
+--EXPECT--
+bool(true)
+Foo::__invoke
+bool(true)
+Foo::__invoke
+bool(true)
+Foo::__invoke
+bool(true)
+Foo::__invoke
+bool(true)
+Closure::__invoke
+bool(true)
+Closure::__invoke
+bool(true)
+Closure::__invoke
+bool(true)
+Closure::__invoke
diff --git a/tests/zend/closures/closure_017.phpt b/tests/zend/closures/closure_017.phpt
new file mode 100644
index 00000000..15611aea
--- /dev/null
+++ b/tests/zend/closures/closure_017.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Closure 017: Trying to destroy an active lambda function
+--FILE--
+<?php
+$a = function(&$a) { $a = 1; };
+$a($a);
+echo "DONE\n";
+?>
+--EXPECT--
+DONE
\ No newline at end of file